Octopress init
Site updated at 2014-10-10 23:09:27 UTC
merge conflicts fixed hopefully