Octopress init
Merge branch 'master' of https://github.com/m-yamashita/m-yamashita.github.io

Conflicts:
	index.html