FightState added
Merge branch 'master' of https://github.com/spboom/CPP_EindOpdracht

Conflicts:
	RogueDungeon/RogueDungeon/RogueDungeon.vcxproj.filters