add branchname.txt
add master.txt
Merge branch 'branchname'