testet 2e
Merge branch 'master' of https://github.com/martinvl/oblig2a