[UPDATE] Configuration & game
Merge branch 'master' of https://github.com/wlalele/hiya