Conflict test
Merge branch 'master' of github.com:guokrspace/HelloWorld into test-branch-3

Conflicts:
	README_IN_A_BRANCH