Octopress init
Site updated at 2014-10-31 13:20:45 UTC
fix conflicts