Haiku formatting
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Merge pull request #48 from ttur/gh-pages

Haiku formatting