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

Conflicts:
	A.txt
Merge branch 'master' of https://github.com/Evgin/RepoA

Conflicts:
	A.txt
Merge pull request #3 from MobiDom/master

Update