new
Merge branch 'master' of https://github.com/SilunWang/RunningMan

Conflicts:
	KuPao.exe
	KuPao.obj