test
Merge branch 'master' of https://github.com/nakasan79/gitstudy

Conflicts:
	index.html