Preparing to merge
Preparing to merge again
Merge remote-tracking branch 'origin/master'

Conflicts:
	MQP/MQP.sdf
	MQP/MQP.v12.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	MQP/MQP.sdf
	MQP/MQP.v12.suo
Preparing to merge even more
Merge branch 'master' of https://github.com/ctmanuel/JapanMQP

Conflicts:
	MQP/MQP.sdf
	MQP/MQP.v12.suo
Makes hand move with player.
Merge branch 'master' of https://github.com/ctmanuel/JapanMQP

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/Game.obj
	MQP/MQP/Debug/GameCamera.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/MQP.write.1u.tlog
	MQP/MQP/Debug/Player.obj
	MQP/MQP/Debug/ResetAction.obj
	MQP/MQP/Debug/Tank.obj
	MQP/MQP/Debug/vc120.idb
	MQP/MQP/Debug/vc120.pdb
	MQP/MQP/Player.cpp