test.txtを編集しました
Merge branch 'chizuru1' into chizuru2

Conflicts:
	test.txt