Merge branch 'master' of https://github.com/outb0x/hello-world into outb0x-master

Conflicts:
	README.md
Merge branch 'master' of https://github.com/florianbussmann/hello-world