test
Added nok-en-fil-txt
Merge branch 'morten-branch' into ninatullebranch
Merge branch 'henrikSinBranch' into ninatullebranch