finish Readme

Hi Hi
Update README.md
Update README.md
Merge branch 'master' into readme-edits

Conflicts:
	README.md
Merge branch 'readme-edits' of https://github.com/tingru/hello-world into readme-edits

Conflicts:
	README.md