wed
Merge branch 'master' of https://github.com/mikhaylenko/my

Conflicts:
	new.txt