adding file masterfile.txt to master
Merge remote-tracking branch 'origin/master' into testbranch
removed masterfile.txt on testbranch