Complete GUI
Merge branch 'master' of https://github.com/Bumbibear/SYSB13