н
Merge branch 'master' of github.com:lonesta/test1.ru

Conflicts:
	www/index.html