Octopress init
Site updated at 2014-01-04 19:49:16 UTC
Site updated at 2014-01-04 19:52:15 UTC
fixing merge