change 3 to 4 for a.txt
add file b.txt
Merge branch 'branch2_base_on_branch1' of github.com:jjofseattle/gittest2 into branch2_base_on_branch1