Merge branch 'master' of https://github.com/smileball/HelloWorld

Conflicts:
	README.md
12