preparing to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	C4/MQP.dll
	C4/MQP.exp
	C4/MQP.ilk
	C4/MQP.lib
	C4/MQP.pdb
	C4/Save/settings
	MQP/MQP.sdf
	MQP/MQP.v12.suo
	MQP/MQP/Debug/Game.obj
	MQP/MQP/Debug/GameCamera.obj
	MQP/MQP/Debug/GameWorld.obj
	MQP/MQP/Debug/HandController.obj
	MQP/MQP/Debug/LightPathController.obj
	MQP/MQP/Debug/MQP.log
	MQP/MQP/Debug/MQP.tlog/CL.read.1.tlog
	MQP/MQP/Debug/MQP.tlog/CL.write.1.tlog
	MQP/MQP/Debug/MQP.tlog/MQP.lastbuildstate
	MQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog
	MQP/MQP/Debug/MQP.tlog/cl.command.1.tlog
	MQP/MQP/Debug/MQP.tlog/link.command.1.tlog
	MQP/MQP/Debug/MQP.tlog/link.read.1.tlog
	MQP/MQP/Debug/MQP.tlog/link.write.1.tlog
	MQP/MQP/Debug/Player.obj
	MQP/MQP/Debug/ResetAction.obj
	MQP/MQP/Debug/vc120.idb
	MQP/MQP/Debug/vc120.pdb
	MQP/MQP/MQP.vcxproj.user