Merge branch 'master' of https://github.com/radistka/K-K

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/radistka/K-K

Conflicts:
	test.txt