Create fileToMerge.txt
Merge pull request #1 from robertemma/tpGit

Create fileToMerge.txt