Octopress init
merge conflict fixed
Site updated at 2013-01-24 19:17:51 UTC