Formatting
Merge branch 'gh-pages' of github.com:tef/computer into gh-pages