merge test
Merge branch 'master' of https://github.com/m-nakaya/test

Conflicts:
	test2.txt

merged