Refactor app
Merge branch 'master' of https://github.com/pnthang01/RealLifeRealGame