Merge remote-tracking branch 'origin/master'

Conflicts:
	Main Program/kingsCorners/Debug/kingsCorners.exe
	Main Program/kingsCorners/Debug/kingsCorners.ilk
	Main Program/kingsCorners/Debug/kingsCorners.pdb
	Main Program/kingsCorners/kingsCorners.sdf
	Main Program/kingsCorners/kingsCorners/Debug/kingsCorners.log
	Main Program/kingsCorners/kingsCorners/Debug/kingsCorners.obj
	Main Program/kingsCorners/kingsCorners/Debug/vc110.idb
	Main Program/kingsCorners/kingsCorners/Debug/vc110.pdb