Oppdatert kilder
Merge branch 'master' of https://github.com/vegarnorman/Gruppe25