去除不必要注释
Merge branch 'master' of https://github.com/iceable/RPGDemo

Conflicts:
	RPGDemo/Bin/RPGDemo.log
	RPGDemo/gameobject/people/selfpeople.cpp
Merge branch 'master' of https://github.com/iceable/RPGDemo