Merge pull request #1 from masaru-nemoto-biz/natuki_work

OK
Merge pull request #3 from masaru-nemoto-biz/natuki_work

追加更新
Merge pull request #4 from masaru-nemoto-biz/master

marge
database
画面遷移判定方法を変更
Merge pull request #7 from masaru-nemoto-biz/masaru_work

Masaru work