проба пера1
Merge branch 'master' of github.com:alexander307/dn.local

Conflicts:
	README.md
Удалено