Octopress init
Site updated at 2014-01-02 22:19:30 UTC
Site updated at 2014-01-02 22:22:37 UTC
merged conflicts after regenerating site with new octopress version