ResourceController en resource

aanpassingen
Merge branch 'master' of https://github.com/ashwindos/Project_KB01_2

Conflicts:
	.gitignore
	Debug/GameEngine.exe
	Debug/GameEngine.ilk
	Debug/GameEngine.pdb
	GameEngine/Debug/CL.read.1.tlog
	GameEngine/Debug/CL.write.1.tlog
	GameEngine/Debug/DirectX.obj
	GameEngine/Debug/GameEngine.log
	GameEngine/Debug/GameEngine.obj
	GameEngine/Debug/Kernel.obj
	GameEngine/Debug/Scene.obj
	GameEngine/Debug/Window.obj
	GameEngine/Debug/link.read.1.tlog
	GameEngine/Debug/vc100.idb
	GameEngine/Debug/vc100.pdb
	GameEngine/GameEngine.cpp
	GameEngine/log.txt
	ipch/gameengine-10393226/gameengine-c39335c.ipch
	ipch/gameengine-e1c4430a/gameengine-c39335c.ipch
Merge branch 'master' of https://github.com/ashwindos/Project_KB01_2