1
Merge branch 'master' of https://github.com/Evgin/RepoA

Conflicts:
	A.txt