Endret paa kurs1, del1
Merge branch 'kurs1lars'