Octopress init
Merge resolution