123.txt changes
Merge branch 'test'

Conflicts:
	123.txt
qwerty
Merge pull request #1 from WslF/master

New pull Request fromm WslF
Merge pull request #2 from AndreyNeophron/xyaster

qwerty