Merge branch 'framebuffer' into mellanhand

Conflicts:
	Fimbul.sdf
	Fimbul.v11.suo
	Fimbul/Debug/Fimbul.exe
	Fimbul/Debug/Fimbul.ilk
	Fimbul/Debug/Fimbul.pdb
	Fimbul/Fimbul.sdf
	Fimbul/Fimbul.v11.suo
	Fimbul/Fimbul/Debug/BackGround.obj
	Fimbul/Fimbul/Debug/CL.read.1.tlog
	Fimbul/Fimbul/Debug/CL.write.1.tlog
	Fimbul/Fimbul/Debug/Entity.obj
	Fimbul/Fimbul/Debug/Fimbul.log
	Fimbul/Fimbul/Debug/Game.obj
	Fimbul/Fimbul/Debug/Main.obj
	Fimbul/Fimbul/Debug/RectangleToMove.obj
	Fimbul/Fimbul/Debug/cl.command.1.tlog
	Fimbul/Fimbul/Debug/createStuff.obj
	Fimbul/Fimbul/Debug/link.command.1.tlog
	Fimbul/Fimbul/Debug/link.read.1.tlog
	Fimbul/Fimbul/Debug/link.write.1.tlog
	Fimbul/Fimbul/Debug/vc110.idb
	Fimbul/Fimbul/Debug/vc110.pdb
	Fimbul/Fimbul/Release/CL.read.1.tlog
	Fimbul/Fimbul/Release/CL.write.1.tlog
	Fimbul/Fimbul/Release/Fimbul.log
	Fimbul/Fimbul/Release/Game.obj
	Fimbul/Fimbul/Release/Main.obj
	Fimbul/Fimbul/Release/cl.command.1.tlog
	Fimbul/Fimbul/Release/link.command.1.tlog
	Fimbul/Fimbul/Release/link.read.1.tlog
	Fimbul/Fimbul/Release/link.write.1.tlog
	Fimbul/Fimbul/Release/vc110.pdb
	Fimbul/Fimbul/Thumbs.db
	Fimbul/Release/Fimbul.exe
	Fimbul/Release/Fimbul.pdb
Merge branch 'mellanhand' of https://github.com/TheAtomicGnome/Fimbul into mellanhand

Conflicts:
	Fimbul/Debug/Fimbul.exe
	Fimbul/Debug/Fimbul.ilk
	Fimbul/Debug/Fimbul.pdb
	Fimbul/Fimbul.sdf
	Fimbul/Fimbul.v11.suo
	Fimbul/Fimbul/Debug/BackGround.obj
	Fimbul/Fimbul/Debug/CL.write.1.tlog
	Fimbul/Fimbul/Debug/Entity.obj
	Fimbul/Fimbul/Debug/Game.obj
	Fimbul/Fimbul/Debug/Main.obj
	Fimbul/Fimbul/Debug/RectangleToMove.obj
	Fimbul/Fimbul/Debug/createStuff.obj
	Fimbul/Fimbul/Debug/link.read.1.tlog
	Fimbul/Fimbul/Debug/vc110.idb
	Fimbul/Fimbul/Debug/vc110.pdb
	Fimbul/Fimbul/Thumbs.db