Merge branch 'gh-pages' of https://github.com/tripletree/blog into gh-pages

Conflicts:
update