Merge branch 'gh-pages' of github.com:kiyukuta/kiyukuta.github.io into gh-pages

Conflicts:
	searchindex.js
Merge branch 'gh-pages' of github.com:kiyukuta/kiyukuta.github.io into gh-pages

Conflicts:
	searchindex.js