edit by Okada
Merge branch 'master' of http://github.com/tom--bo/training2

Conflicts:
	test1.txt