Octopress init
fixing merge conflict
Site updated at 2013-08-08 09:19:08 UTC