Octopress init
Site updated at 2014-12-20 20:50:07 UTC
Site updated at 2014-12-20 20:55:58 UTC
resolve gh-pages branch merge conflicts from octopress upgrade