dunno why i need to push these files...
Merge branch 'master' of https://github.com/iLikeSoup/dccCapstone.git

Conflicts:
	ManhuntTwoPointOh/bin/ManhuntTwoPointOh.apk
	ManhuntTwoPointOh/bin/classes.dex
	ManhuntTwoPointOh/bin/classes/.gitignore
	ManhuntTwoPointOh/bin/resources.ap_
	ManhuntTwoPointOh/gen/.gitignore
	ManhuntTwoPointOh/src/com/example/manhunttwopointoh/MainActivity.java