add hirokazu
Merge branch 'master' into Hirokazu

Conflicts:
	index.html
Merge branch 'Hirokazu'