Linux test successfull
Merge branch 'ScrumFeatures' of github.com:HendrikKolver/COS301 into ScrumFeatures