nu uden testData filen
Merge branch 'Lisbeth' into Sprint3
Merge remote-tracking branch 'origin/Sprint3' into Klim