ToDelete deleted with git rm
Merge branch 'master' into fileDeletedBetter