Create fileToMerge.txt
Merge pull request #2 from Mawoue/tpGit

Create fileToMerge.txt