Octopress init
fix this merge shit