a da
Merge branch 'master' of github.com:mikhaylenko/my

Conflicts:
	new.txt
d drtgdr