3
Merge branch 'develop' of https://github.com/Inteo/idn500.ru into develop

Conflicts:
	f/css/main.css
	index.html