adachi test
Merge branch 'master' of https://github.com/katsuo29/sample

Conflicts:
	text.txt