gitignore
bin commit
Merge branch 'master' of https://github.com/mjimen26/MODS.git

Conflicts:
	MODSApp/bin/AndroidManifest.xml
	MODSApp/bin/MODSApp.apk
	MODSApp/bin/classes.dex