add hiro_oobayashi.html
Merge branch 'master' into add_oobayashi

Conflicts:
	index.html
add hiro_oobayashi.html
Merge branch 'add_oobayashi'

Conflicts:
	index.html