Changes on Gui
Merge branch 'master' of https://github.com/owsm/inf3project