create master2.txt
Merge branch 'master' into branch1