messed up with gui...
Merge branch 'master' of github.com:RafiKueng/MasterThesisPresentation