Octopress init
Fix conflicts
Site updated at 2014-08-23 15:23:17 UTC