jiangfeng
Merge branch 'master' of https://github.com/guanjj28/Git-Game-Test

Conflicts:
	README.md