寿司直す気を追加
Merge branch 'master' into osushi
merge conflict of osushi.md (close #35)