Add b.txt
Merge branch 'branch2'