added new method
Merge branch 'master' into try1

Conflicts:
	src/FightClub.java