committing
Merge branch 'master' of https://github.com/stephenfarrar/hello
hideAll automatic
Merge branch 'master' of https://github.com/stephenfarrar/hello