Small change
Merge branch 'master' of https://github.com/rod2016/SurvivalFighter

Conflicts:
	Game.class
	Game.java