change2
Merge branch 'master' of https://github.com/link-alex/testing

Conflicts:
	kuku.txt