競合テスト
Merge branch 'master' of https://github.com/yukipon/gitbootcamp

Conflicts:
	test04.txt
Merge branch 'master' of https://github.com/yukipon/gitbootcamp

Conflicts:
	test04.txt