Octopress init
Site updated at 2014-10-07 04:00:16 UTC
Site updated at 2014-10-07 04:22:43 UTC
save before merge, hopefully fixes many merge conflicts