testfil1
Merge https://github.com/EirikBr/kurstest1