Merge branch 'master' of https://github.com/KidaSacheil/Gr12Webprosjekt

Conflicts:
Nettstedet/css/innhold.css
innhold