г
г
Merge remote-tracking branch 'origin/research' into research

Conflicts:
	index.html
Merge remote-tracking branch 'origin/research' into research
Merge remote-tracking branch 'origin/research' into research
г