Hopefully fixed all issues
Merge branch 'master' of https://github.com/jennwu/Diversity

Conflicts:
	ParseStarterProject/AndroidManifest.xml
	ParseStarterProject/src/com/parse/starter/GPSActivity.java
	ParseStarterProject/src/com/parse/starter/PuzzleActivity.java