Revert a70f537..9744426

This rolls back to commit a70f537276b982be4434be8c12eb97d9d963446c.
360˚ ar dip
Merge branch 'master' of https://github.com/patrickg2014/Capstone

Conflicts:
	Campus Tours/Campus Tours/Campus
Tours.xcodeproj/project.xcworkspace/xcuserdata/williamrathje.xcuserdatad
/UserInterfaceState.xcuserstate
	Campus Tours/Campus Tours/Campus Tours/BRViewController.m
	Eli's code/bin/classes/com/cs440/capstone/CameraActivity.class
	Eli's code/src/com/cs440/capstone/CameraActivity.java
	google-play-services_lib/bin/google-play-services_lib.jar