Octopress init
Site updated at 2014-03-29 02:23:48 UTC
Site updated at 2014-03-29 02:29:26 UTC
fix merge conflicts