Ethan's comment
Merge branch 'master' of https://github.com/mjimen26/MODS.git

Conflicts:
	MODSApp/AndroidManifest.xml