Factorys zitten erin
Merge branch 'master' of https://github.com/spboom/CPP_EindOpdracht

Conflicts:
	RogueDungeon/RogueDungeon/Controller/Controller.cpp
	RogueDungeon/RogueDungeon/Controller/Factory.cpp
	RogueDungeon/RogueDungeon/Controller/Factory.h
	RogueDungeon/RogueDungeon/States/FightState.cpp
	RogueDungeon/RogueDungeon/States/MainMenuState.cpp
	RogueDungeon/RogueDungeon/States/PlayState.cpp
Big hotfixes