Merge remote-tracking branch 'origin/master'

Conflicts:
	Main Program/kingsCorners/kingsCorners/Debug/CL.read.1.tlog
	Main Program/kingsCorners/kingsCorners/Debug/CL.write.1.tlog
	Main Program/kingsCorners/kingsCorners/Debug/cl.command.1.tlog
	Main Program/kingsCorners/kingsCorners/Debug/kingsCorners.log
	Main Program/kingsCorners/kingsCorners/Debug/vc110.idb
	Main Program/kingsCorners/kingsCorners/Debug/vc110.pdb
	Main Program/kingsCorners/kingsCorners/kingsCorners.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main Program/kingsCorners/kingsCorners.sdf
	Main Program/kingsCorners/kingsCorners.v11.suo