zhicheng branch 修改
冲突解决
Merge branch 'zhicheng'

Conflicts:
	source.cpp