Create fileToMerge
Rename fileToMerge to fileToMerge.txt
Merge pull request #1 from auryane/tpGit

Tp git