Home Page

Added code for functional first draft of the home page
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
Revert "Merge branch 'master' of https://github.com/zacmontague/DMApp"

This reverts commit edcd278f9d5e2a5ea5dd884ce94707f8f94baf34, reversing
changes made to d55c5eff98f810377d2c2e81215c5386049b6e66.
Fixed merge conflicts
Merge remote-tracking branch 'origin/chris'
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
Fixed merge issues
Small errors fixed
Fixed merge issues

When you reverted your merge, it removed all the gridview files and
stuff for some reason. I got it back.
Child pic
Merge remote-tracking branch 'origin/chris'
Merge remote-tracking branch 'origin/master' into chris
Finished military time