Better GUI based on Robert's branch. Collaborators: Robert, Ramin and Pim.
Merge branch 'master' of github.com:LinkyXoth/Contextproject-Group5