Local changes
Merge branch 'jeremysfeature' of https://github.com/jfinke/hellogitworld into jeremysfeature

Conflicts:
	jeremyfeature.txt