Uppgift 5
Merge branch 'master' of http://github.com/Dataingenjor/datakomLab1