Merging to recieve Brandon's shit
Merge branch 'master' of https://github.com/cjy008/DragonFists

Conflicts:
	bin/DragonFist.apk
	bin/classes.dex
	src/com/dragonfist/GameView.java
Merge branch 'master' of https://github.com/cjy008/DragonFists

Conflicts:
	bin/DragonFist.apk
	bin/classes.dex

???