Octopress init
Site updated at 2014-06-21 23:16:44 UTC
Fix merge conflicts