Octopress init
Site updated at 2014-03-13 23:48:32 UTC
resolved conflict