dete er min papa
Merge branch 'master' of github.com:lindkjop/swaggruppe12

I was behind master, had to catch up :3
Merge branch 'master' of github.com:lindkjop/swaggruppe12