fixed lots of issues
Merge branch 'master' of github.com:justinmc/hello-world-1

Conflicts:
	README.md