second commit
Merge branch 'master' of https://github.com/kenta88/FRONT_END_BASEPROJECT