xdedde
Comments and syntax
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/WIP_Engine.exe
	Debug/WIP_Engine.ilk
	Debug/WIP_Engine.pdb
	WIP_Engine.sdf
	WIP_Engine/Debug/Main.obj
	WIP_Engine/Debug/WIP_Engine.log
	WIP_Engine/Debug/WIP_Engine.tlog/CL.read.1.tlog
	WIP_Engine/Debug/WIP_Engine.tlog/CL.write.1.tlog
	WIP_Engine/Debug/WIP_Engine.tlog/WIP_Engine.lastbuildstate
	WIP_Engine/Debug/WIP_Engine.tlog/cl.command.1.tlog
	WIP_Engine/Debug/WIP_Engine.tlog/link.command.1.tlog
	WIP_Engine/Debug/WIP_Engine.tlog/link.read.1.tlog
	WIP_Engine/Debug/WIP_Engine.tlog/link.write.1.tlog
	WIP_Engine/Debug/Window.obj
	WIP_Engine/Debug/lodepng.obj
	WIP_Engine/Debug/vc120.idb
	WIP_Engine/Debug/vc120.pdb