Octopress init
Site updated at 2014-06-15 05:38:01 UTC
Fix merge conflict
Site updated at 2014-06-15 05:48:17 UTC