GUI update
Merge branch 'master' of
https://github.com/xdflolol/Programmieren-Projekt-TINF2013