Some clean up/fixes
YAY CONFLICTS!!!!

Conflicts:
	Capstone/bin/Capstone.apk
	Capstone/bin/R.txt
	Capstone/bin/classes.dex
	Capstone/bin/classes/com/cs440/capstone/BuildingInfoActivity.class
	Capstone/bin/classes/com/cs440/capstone/CameraOverlay.class
	Capstone/bin/classes/com/cs440/capstone/MainActivity.class
	Capstone/bin/classes/com/cs440/capstone/R$id.class
	Capstone/bin/classes/com/cs440/capstone/R$integer.class
	Capstone/bin/classes/com/cs440/capstone/R$string.class
	Capstone/bin/classes/com/cs440/capstone/R$style.class
	Capstone/bin/classes/com/cs440/capstone/R$styleable.class
	Capstone/bin/resources.ap_
	Capstone/gen/com/cs440/capstone/R.java