git etiquette
Merge branch 'gh-pages' of github.com:thornag/blog into gh-pages