проверка мержа
Merge branch 'master' of https://github.com/babayko/MachineIDE

Conflicts:
	123.txt