Octopress init
Site updated at 2014-02-01 10:13:26 UTC
fix conflic