B.txtの変更
B.txtの追加
Merge branch 'master' of https://github.com/moritak/TestRepo

Conflicts:
	A.txt
b