~
Merge branch 'master' of https://github.com/peishanyen/GitTest

Conflicts:
	README.md