Updates the inside view stuff and a few other drawing issues
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/classes/com/cs440/capstone/MainActivity$1.class
	Eli's
code/bin/classes/com/cs440/capstone/MainActivity$DrawerItemClickListener
.class
	Eli's code/bin/classes/com/cs440/capstone/MainActivity.class
	Eli's code/bin/classes/com/facebook/android/R$drawable.class
	Eli's code/bin/classes/com/facebook/android/R$id.class
	Eli's code/bin/resources.ap_
	Eli's code/src/com/cs440/capstone/MainActivity.java

facebook-android-sdk-3.7/samples/Scrumptious/gen/com/facebook/android/R.
java