fix on fix ;)
Merge branch 'master' of https://github.com/spboom/CPP_EindOpdracht

Conflicts:
	RogueDungeon/RogueDungeon/Model/Location/Room.cpp