Homepage edits
Merge branch 'master' of https://github.com/zacmontague/DMApp

Conflicts:
	Android Code/dancemarathon/res/layout/activity_swipe.xml
	Android Code/dancemarathon/res/values/strings.xml
	Android
Code/dancemarathon/src/com/example/dancemarathon/SwipeActivity.java
Fixed merge commit stuff
Merge remote-tracking branch 'origin/master' into chris