2
Merge branch 'master' of github.com:Sc-pyK/test

Conflicts:
	a.txt