d
Merge branch 'gh-pages' of github.com:ssir/oblog into gh-pages