no idea what's this
Merge branch 'Scott' of https://github.com/MultiHopHop/ProjectGame into Scott

Conflicts:
	bin/ProjectGame.apk
	bin/classes.dex
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/res/crunch/drawable-ldpi/ic_launcher.png
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable/icon.png
	bin/resources.ap_