Added file.txt
Added line3 to file.txt
Merge branch 'master' of github.com:mrmunge/myrepo