asd
saving changes
...
huh
testing
Merge branch 'master' of https://github.com/iLikeSoup/dccCapstone.git

Conflicts:
	ManhuntTwoPointOh/bin/ManhuntTwoPointOh.apk
	ManhuntTwoPointOh/bin/classes.dex
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/MainActivity.class
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/R$drawable.class
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/R$id.class
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/R$layout.class
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/R$menu.class
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/R$string.class
	ManhuntTwoPointOh/bin/classes/com/example/manhunttwopointoh/R$style.class
	ManhuntTwoPointOh/bin/dexedLibs/google-play-services_lib-6cc1edd006db24cdebcf1075f44d0985.jar
	ManhuntTwoPointOh/bin/resources.ap_