stuff
Merge branch 'master' of github.com:SuperCoolYCHackTeam/DoingSomethingUseful

Conflicts:
	mobile/src/main/java/com/ychack/doingsomethinguseful/CameraActivity.java