Octopress init
Resolving conflict.
Site updated at 2014-05-30 12:14:12 UTC