Add a.txt
Merge branch 'teexte'

Conflicts:
	a.txt
Modified a.txt