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

Conflicts:
	test.txt