Merge branch 'jimmy' of https://github.com/xiao00li/AI into Lee

Conflicts:
	Add_Player_Dlg.h
	Add_Player_Dlg.h.orig
	Debug/AI Final Porject.log
	Debug/AI Final Porject.obj
	Debug/AI Final Porject.pch
	Debug/AI Final Porject.res
	Debug/AI Final PorjectDlg.obj
	Debug/Add_Player_Dlg.obj
	Debug/Add_Tactics_Dlg.obj
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/Delete_Player_Dlg.obj
	Debug/Delete_Tactics_Dlg.obj
	Debug/cl.command.1.tlog
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/link.write.1.tlog
	Debug/stdafx.obj
	Debug/vc110.idb
	Debug/vc110.pdb
fds