masterに追記1
masterに追記2
masterに追記3
マージ
Merge remote-tracking branch 'remotes/origin/master' into bra1

Conflicts:
	t1.txt