本地1次编辑
Merge branch 'master' of https://github.com/Alexhust/git_remote

Conflicts:
	README.md