test 5 added
Merge branch 'master' of github.com:Oyvindkg/TDT4140-Gruppe-23