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

Conflicts:
	FantasyShooter/bin/FantasyShooter.apk
	FantasyShooter/bin/classes.dex
	FantasyShooter/bin/resources.ap_
	FantasyShooter/gen/com/example/fantasyshooter/R.java