Modified in local.
Merge branch 'master' of https://github.com/masatak/repo-test2

Conflicts:
	test1.txt