about 1 page
Merge remote-tracking branch 'origin/moroz'

Conflicts:
	css/screen.css
	img/icons-s84f5aeb6b8.png
	sass/screen.sass