Kong
Merge branch 'master' of https://github.com/kong666/HelloWorld.git

Conflicts:
	test.txt