merge
Merge branch 'master' of https://github.com/guy101100/cageFight.git

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/resources.ap_