simplify
Merge branch 'master' of https://github.com/morris821028/Web-UkagakaProj