master-update1
master-update2
update1

update2

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

Conflicts:
	a.txt