conflict test. for test.
Merge branch 'master' of https://github.com/yama-take/test

Conflicts:
	test.txt

resolved. yes!