changed
Merge branch 'master' of https://github.com/xmulzz/HelloWorldRepo

Conflicts:
	README
test