Octopress init
fix merge conflict