merge
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave
update to the build tex