add A
Merge branch 'master' of https://github.com/azole/Test

Conflicts:
	test.txt