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

Conflicts:
	RogueDungeon/RogueDungeon/States/PlayState.cpp
Merge branch 'master' of https://github.com/spboom/CPP_EindOpdracht

Conflicts:
	RogueDungeon/RogueDungeon/States/PlayState.cpp