before killSoldier
Merge branch 'master' of https://github.com/liyonghelpme/wangServer2

Conflicts:
	app.py
Merge branch 'master' of https://github.com/liyonghelpme/wangServer2