setting up the project with parse and facebook. still facebook throws some error.
Merge branch 'master' of github.com:CodePathFuntastic/Team10

Conflicts:
	CharityChallenger/AndroidManifest.xml
	CharityChallenger/project.properties