Octopress init
Fixed merge conflict