Master commit
Merge branch 'testing'

Conflicts:
	Newfile.txt
Merge branch 'master' of https://github.com/zxccv/Balls
Добавили фигню в testing.txt
Решили конфликт