Octopress init
Site updated at 2014-10-18 03:44:24 UTC
resolved conflicts
Site updated at 2014-10-18 03:55:46 UTC