add files
тест
правки1
правки
правки
правки
Merge branch 'master' of https://github.com/wingart/nadivane

Conflicts:
	css/flexslider.css
	css/idangerous.swiper.scrollbar.css
	css/nadivane_all-factory.css
	css/nadivane_factory.css
	css/nadivane_sale-page.css
	css/nadivane_shock-price.css
	css/styles.css
	css/subcategory.css
	nadivane_all-factory.php
	nadivane_factory.php
	subcategory.php