collaboration
Merge branch 'master' of https://github.com/dailidenok/test

Conflicts:
	1.html