fixed a catachrestial failure
Octopress init
Site updated at 2014-03-20 12:35:33 UTC
Site updated at 2014-03-20 12:38:32 UTC
Merge remote-tracking branch 'origin/master' into source
merged conflict files