init dev
dev1
dev2
master2
master3
master4
Merge branch 'master' of https://github.com/hulefei/HelloGit

Conflicts:
	HelloGit.txt
merge