文言の修正
Merge remote-tracking branch 'origin/tanimoto'

Conflicts:
	demo/index.html