romved method
Merge branch 'master' of https://github.com/DarkPantherX/FightClub

Conflicts:
	src/Player.java