fixed
Merge branch 'master' of https://github.com/suppayami/yamiworld.com