nuthn really
Merge branch 'master' of github.com:SimenHjelden/DS4100_Innlevering_3
fix of merge conflict