Change text
change text
Merge branch 'akashi-change-text'

Conflicts:
	index.html