oving3 commitet
Merge branch 'master' of github.com:Oyvindkg/TDT4140-Gruppe-23