TestC 2nd
add 3rd
add 4th
TestC 5th
Merge branch 'develop' into TestC

Conflicts:
	sample.txt
改行を追加