Merge branch 'master' of https://github.com/almasmaris/Hello-World

Conflicts:
	README
Merge branch 'master' of https://github.com/almasmaris/Hello-World

Conflicts:
	README