Fixing GUI
Merge branch 'master' of https://github.com/techcamp15-vietnam/team06