Octopress init
Site updated at 2014-12-21 22:05:30 UTC
fix conflicts