Octopress init
Site updated at 2013-08-27 21:43:05 UTC
fixing merge