endret tekst
Merge conflict
fixed chapter 6 to work with report