Merge branch 'master' of https://github.com/DevillersJerome/testmerge
and add new file