Merge remote-tracking branch 'origin/master'
TestBattle server,client,ai,main
Merge remote-tracking branch 'origin/master'
调整游戏速度
回放器进度条
nothing
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
TestBattle merged
aiConnErr bug fixed
2.71828 released
delete jpg,add test ai
nth
nothing
testbattle 5,6 added
cancel det
'or' priority bug fixed, program can run again