battleIo修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_game/views/ranklist.ejs
battleIo修改