Revert dd368bb..5b0c857

This rolls back to commit dd368bbfc882097e1688f3840a71cfbe28865aef.
Merge branch 'master' of https://github.com/zacmontague/DMApp

Conflicts:
	Android Code/dancemarathon/AndroidManifest.xml