branch a add

new branch a
Update test.txt
Merge branch 'master' into a

Conflicts:
	test.txt