commit
Merge remote-tracking branch 'origin/master'
文字のところ修正