BBB
Merge remote-tracking branch 'remotes/originMyTest01/master'

Conflicts:
	sample.txt
競合の解決