mappå mi

Mjes
Merge branch 'master' of https://github.com/huxflux/gruppe8-test