Octopress init
Site updated at 2014-07-02 07:05:08 UTC
Site updated at 2014-07-02 07:13:53 UTC
fixed merge conflict