Octopress init
Site updated at 2014-07-27 17:39:34 UTC
Site updated at 2014-07-27 17:54:50 UTC
fixed conflicts