Octopress init
Resolving conflicts
Site updated at 2014-06-11 10:19:12 UTC