4
1
Merge branch 'master' of https://github.com/shenzhang/gitdemo.git
Merge remote-tracking branch 'origin/master'
4444
Merge branch 'master' of https://github.com/shenzhang/gitdemo.git

Conflicts:
	README.md