updaet a in the master branch
Merge branch 'b1.1'

Conflicts:
	a.txt
add new file
update
update
add new file