Octopress init
Site updated at 2014-05-19 04:34:21 UTC
resolve conflict