Stamina, health, GG.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dung/src/dungContent/ControllerPlayer.java