Edit修正なう
Merge branch 'master' of https://github.com/aokikeisuke/syaa into develop