Octopress init
fixing merge
Site updated at 2014-01-10 11:25:57 UTC