sending a push
Merge branch 'master' of github.com:CodePathFuntastic/Team10

Conflicts:
	CharityChallenger/src/org/codepath/team10/charitychallenger/CharityChallengerApplication.java