Octopress init
Site updated at 2014-10-13 14:58:50 UTC
Site updated at 2014-10-13 15:08:11 UTC
modify some conflicts