Octopress init
Site updated at 2014-10-28 10:47:42 UTC
Fixed merge conflict