init hello
add some Line
test file commit
Merge branch 'master' of https://github.com/ChineseLincoln/learnGit

Conflicts:
	hello