bounding
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Planet.exe
	Debug/Planet.ilk
	Debug/Planet.log
	Debug/Planet.pdb
	Debug/cl.command.1.tlog
	Debug/entity.obj
	Debug/game.obj
	Debug/graphics.obj
	Debug/image.obj
	Debug/input.obj
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/link.write.1.tlog
	Debug/paddle.obj
	Debug/spacewar.obj
	Debug/textureManager.obj
	Debug/vc110.idb
	Debug/vc110.pdb
	Debug/winmain.obj
	Planet.sdf