競合テスト
Merge branch 'master' of github.com:Tkanbara/yuruGit

Conflicts:
	index.html