Revert "Merge branch 'master' of https://github.com/zacmontague/DMApp"

This reverts commit edcd278f9d5e2a5ea5dd884ce94707f8f94baf34, reversing
changes made to d55c5eff98f810377d2c2e81215c5386049b6e66.
Homepage Revision
Merge branch 'master' of https://github.com/zacmontague/DMApp

Conflicts:
	Android Code/dancemarathon/res/values/strings.xml
	Android
Code/dancemarathon/src/com/example/dancemarathon/SwipeActivity.java