Octopress init
Merge branch 'master' of github.com:RyoNarita/ryonarita.github.io

Conflicts:
	index.html