# Conflicts:
#	README.md
#
android/src/main/java/ca/jaysoo/extradimensions/ExtraDimensionsPackage.j
ava