day done
renamed files
renamed the file in index
fixed mistakes
Merge remote-tracking branch 'origin/Mette' into dev