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

Conflicts:
	FantasyShooter/bin/FantasyShooter.apk
	FantasyShooter/bin/classes.dex
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$id.class
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$layout.class
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$menu.class
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$raw.class
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$string.class
	FantasyShooter/bin/classes/com/example/fantasyshooter/R$style.class
	FantasyShooter/bin/classes/com/fshoot/framepage/StartPage.class
	FantasyShooter/bin/resources.ap_
	FantasyShooter/gen/com/example/fantasyshooter/R.java