Update Commit
Merge branch 'master' of https://github.com/brobinson09/Team2CodeForGood

Conflicts:
	Android/AndroidManifest.xml
	Android/src/com/example/handsonandroid/SplashActivity.java