Merge branch 'master' of https://github.com/ming517/helloworld

Conflicts:
	hello.txt
merge conflict