Давай
Merge branch 'master' of https://github.com/bxmod/Test

Conflicts:
	test-file.php