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
	MQP/MQP.sdf
	MQP/MQP.v12.suo
	MQP/MQP/Debug/MQP.log
	MQP/MQP/Debug/MQP.tlog/CL.write.1.tlog
	MQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog
	MQP/MQP/Debug/Player.obj
	MQP/MQP/Debug/vc120.idb
	MQP/MQP/Debug/vc120.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	C4/MQP.dll
	C4/MQP.exp
	C4/MQP.ilk
	C4/MQP.lib
	C4/MQP.pdb
	MQP/MQP.sdf
	MQP/MQP.v12.suo
	MQP/MQP/Debug/MQP.log
	MQP/MQP/Debug/MQP.tlog/CL.write.1.tlog
	MQP/MQP/Debug/MQP.tlog/MQP.write.1u.tlog
	MQP/MQP/Debug/Player.obj
	MQP/MQP/Debug/vc120.idb
	MQP/MQP/Debug/vc120.pdb
Merged, and disables collision detection on light path because it was making the player move funny.