[追加]
Merge branch 'master' of https://github.com/masaki16322337/test

Conflicts:
	test.txt
[修正]test.txt