comit
Merge branch 'NewBranch' of https://github.com/lenhuy2106/HumanDontRage into NewBranch

Conflicts:
	src/edu/hm/cs/se/game/app/Player.java
removed one duplicate