Octopress init
Site updated at 2014-09-16 21:38:16 UTC
Fixed conflicts