test
Merge branch 'master' of
https://github.com/FantasyShooter/Fantasy-Shooter.git

Conflicts:
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$raw.class
	FantasyShooter/bin/classes/com/fshoot/entity/Monster$1.class
	FantasyShooter/bin/classes/com/fshoot/entity/Monster$2.class
	FantasyShooter/bin/classes/com/fshoot/entity/Monster$3.class
	FantasyShooter/bin/classes/com/fshoot/entity/Monster$4.class
	FantasyShooter/bin/classes/com/fshoot/entity/Monster$MyAnimationListener.class
	FantasyShooter/bin/classes/com/fshoot/entity/SmallM.class
	FantasyShooter/bin/classes/com/fshoot/framepage/BattlePage$1.class
	FantasyShooter/bin/classes/com/fshoot/framepage/ShopPage$1$1.class
	FantasyShooter/bin/classes/com/fshoot/framepage/ShopPage$1.class
	FantasyShooter/bin/classes/com/fshoot/framepage/ShopPage$2.class