Haha
Merge branch 'master' of https://github.com/SimenHjelden/DS4100_Innlevering_3.git