Добавление 2
Merge branch 'master' of https://github.com/graninas/test

Conflicts:
	t.html