Oppdatert
dunno om nåkka funke at all
Merge branch 'master' of https://github.com/njardiss/DatabaseProsjekt.git
Merge branch 'master' of https://github.com/njardiss/DatabaseProsjekt.git
sjekke d her da njard