GUI 3
Merge branch 'master' of https://github.com/johnjun/DM2518-Project