Octopress init
Site updated at 2014-12-05 02:18:39 UTC
Site updated at 2014-12-05 02:32:33 UTC
Fix initial conflict