1
Merge branch 'master' of https://github.com/shenzhang/gitdemo.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shenzhang/gitdemo.git
3
4