osushi daisuki
Merge branch 'master' into osushi
merge conflict of osushi.md (close #34)