fix.txtの１行目編集
fix typo2
fix3
Merge branch 'future-D'

Conflicts:
	fix.txt