Formatting
Merge branch 'master' of https://github.com/henriksen/gitn00b