Octopress init
fix merge conflict
Site updated at 2014-01-04 03:48:32 UTC