Octopress init
Site updated at 2013-11-22 11:16:49 UTC
fixing the merge issues