working on push stuff

this push will collide
conflicts/some push stuff(still not working)

Conflicts:
	Capstone/AndroidManifest.xml
	Capstone/bin/AndroidManifest.xml
	Capstone/bin/Capstone.apk
	Capstone/bin/classes.dex
	Capstone/bin/classes/com/cs440/capstone/MainActivity.class
	Capstone/bin/resources.ap_