b1 add a line too
dev
Merge branch 'dev' of https://github.com/DengCaiYun/HelloGit into dev

Conflicts:
	hello