TestBattle server,client,ai,main
Test_Battle fineshed, a few bugs
Merge branch 'master' into server_debugging

Conflicts:
	PlayerFiles/ai.cpp
	PlayerFiles/clientai.cpp
Test Battle Finished @platform
fixes in serv&logic
Merge branch 'debugging' into server_debugging

Conflicts:
	log.log
	sio.py
Merge branch 'server_debugging' into debugging
Merge remote-tracking branch 'origin/server_debugging' into debugging
测试赛