adding test file to the testbranch
Merge remote-tracking branch 'origin/master' into testbranch
removed masterfile.txt on testbranch
adding masterfile2.txt to master branch
Merge branch 'master' into testbranch
adding a new masterfile.txt to master branch
deleting masterfiles from master branch
deleting testmasterfile.txt from master branch