аня
Merge branch 'master' of https://github.com/2UP/YC

Conflicts:
	css/component.css
	css/style.css