diff test commit

diff test commit
Merge branch 'master' of https://github.com/yuheijotaki/test

Conflicts:
	index.html
change

change