Testing buttons

Adding buttons
Merge branch 'master' of https://github.com/patrickg2014/Capstone

Conflicts:
	Eli's code/bin/Capstone.apk
	Eli's code/bin/classes.dex
	Eli's code/bin/classes/com/cs440/capstone/CameraActivity.class
	Eli's code/bin/classes/com/cs440/capstone/CameraOverlay.class
	Eli's code/bin/resources.ap_
	Eli's code/src/com/cs440/capstone/CameraActivity.java
	Eli's code/src/com/cs440/capstone/CameraOverlay.java