Octopress init
Site updated at 2013-11-04 05:39:45 UTC
resolve merge conflicts