tanaka2
Merge branch 'tanaka2' into test

Conflicts:
	test.txt