Octopress init
Site updated at 2013-10-11 15:06:55 UTC
merge resolved