Octopress init
11-25 push -2
merge index.html-2