会長の名前変更
Merge remote-tracking branch 'origin/master'

Conflicts:
	about/index.html