лдлджж
Merge branch 'master' of https://github.com/vadzimrudkouski/test2

Conflicts:
	q.txt