Octopress init
merge