Can't remember what this was for...:q
:
Merge branch 'master' of https://github.com/jmstallard/helloworld
Wow, needed to use git commit -i
don't know why yet.
Conflicts:
	README.md