nu uden testData filen
Merge branch 'Lisbeth' into Sprint3