new files Settings
Merge branch 'NySprint2' into Lisbeth