Added the GUI
Merge branch 'master' of
https://github.com/ProjectGroup-CDIO/CDIOProjektTwo.git