k
Merge branch 'master' of https://www.github.com/magnusmoan/Fellesprosjekt
Merge branch 'master' of https://www.github.com/magnusmoan/Fellesprosjekt