something is broken in the home activity
Merge branch 'master' of github.com:CodePathFuntastic/Team10

Conflicts:
	CharityChallenger/AndroidManifest.xml