Changed from command line
Local update
Merge branch 'joefeature' of https://github.com/jps3318/hellogitworld into joefeature

Conflicts:
	joefeature.txt