edited testfile again in hotfix branch
master branch changes to testfile.txt
Finishing merge of hotfix branch