scherm met kleur
Merge branch 'master' of https://github.com/ashwindos/Project_KB01

Conflicts:
	Debug/GameEngine.exe
	Debug/GameEngine.ilk
	Debug/GameEngine.pdb
	GameEngine.sdf
	GameEngine.suo
	GameEngine/Debug/CL.read.1.tlog
	GameEngine/Debug/CL.write.1.tlog
	GameEngine/Debug/GameEngine.Build.CppClean.log
	GameEngine/Debug/GameEngine.log
	GameEngine/Debug/GameEngine.obj
	GameEngine/Debug/Logger.obj
	GameEngine/Debug/Window.obj
	GameEngine/Debug/cl.command.1.tlog
	GameEngine/Debug/link.1100-cvtres.read.1.tlog
	GameEngine/Debug/link.1100-cvtres.write.1.tlog
	GameEngine/Debug/link.1100.read.1.tlog
	GameEngine/Debug/link.1100.write.1.tlog
	GameEngine/Debug/link.3120-cvtres.read.1.tlog
	GameEngine/Debug/link.3120-cvtres.write.1.tlog
	GameEngine/Debug/link.3120.read.1.tlog
	GameEngine/Debug/link.3120.write.1.tlog
	GameEngine/Debug/link.6512-cvtres.read.1.tlog
	GameEngine/Debug/link.6512-cvtres.write.1.tlog
	GameEngine/Debug/link.6512.read.1.tlog
	GameEngine/Debug/link.6512.write.1.tlog
	GameEngine/Debug/link.command.1.tlog
	GameEngine/Debug/link.read.1.tlog
	GameEngine/Debug/link.write.1.tlog
	GameEngine/Debug/rc.command.1.tlog
	GameEngine/Debug/rc.read.1.tlog
	GameEngine/Debug/rc.write.1.tlog
	GameEngine/Debug/vc100.idb
	GameEngine/Debug/vc100.pdb
	GameEngine/GameEngine.cpp
	GameEngine/GameEngine.vcxproj.filters
	GameEngine/Window.cpp
	GameEngine/Window.h
	ipch/gameengine-9c3147fe/gameengine-c39335c.ipch