la til en hyggelig liten dings!
Merge branch 'master' of https://github.com/lindkjop/swaggruppe12