テスト２
Merge branch 'test_branch'

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/yk5656/test