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

Conflicts:
	Capstone/bin/Capstone.apk
	Capstone/bin/classes.dex
	Capstone/bin/resources.ap_
Merge branch 'master' of https://github.com/patrickg2014/Capstone

Conflicts:
	Capstone/bin/Capstone.apk
	Capstone/bin/classes.dex
	Capstone/bin/classes/com/cs440/capstone/CameraActivity.class
	Capstone/bin/classes/com/cs440/capstone/LoginActivity.class

Capstone/bin/classes/com/cs440/capstone/LoginUsingLoginFragmentActivity.
class
	Capstone/bin/classes/com/cs440/capstone/MainActivity.class
	Capstone/bin/classes/com/cs440/capstone/UserDetailsActivity.class