挨拶のデータを反映
Merge branch 'web-greeting'

Conflicts:
	web/index.html