formatting code nicely
Merge branch 'master' of https://github.com/stephenfarrar/hello