master update1
master update2
branch2 overall update

branch2 update2

branch2 update3
Merge branch 'branch2' of github.com:firstthumb/try_git into branch2

Conflicts:
	a.txt