Added first file
Edited file.txt
Merge branch 'master' of github.com:dhallid/myrepo