Added hello
hotfix
Merge branch 'master' into add-hello
added world
added name
Merge branch 'merge-test'

Conflicts:
	README.rdoc