верстка
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
css
Merge branch 'master' of https://github.com/denisoid/nf-cc

Conflicts:
	.idea/workspace.xml
верстка