commit
commit
delete
Merge branch 'master' of https://github.com/bt-matsuyama/test

Conflicts:
	test.txt