updated GUI5
Merge branch 'GUI' of https://github.com/joelolofsson/DAT096 into GUI