Change from comamnd line
Merge branch 'marksfeature' of github.com:mtrimmer/hellogitworld into marksfeature