Signed-off-by: flymianmian <flymianmian@163.com>
Merge branch 'master' of https://github.com/TyrealGray/AssassinWar.git

Conflicts:
	AssassinWar.cpp