Octopress init
Site updated at 2014-09-13 00:51:14 UTC
Site updated at 2014-09-13 00:54:05 UTC
Fixed merge issues