grand front-end osaka #1
Merge branch 'master' of https://github.com/u651601f/grand-front-end-osaka-1