Octopress init
fixed merge issues
Site updated at 2013-12-22 15:12:34 UTC