Edited test file
Edited testfile.txt in the master branch
Merged changes from hotfix into master branch