Octopress init
Site updated at 2013-07-14 00:07:53 UTC
fix merge