adding footer partials
added csses, route, start makeup
adding footer partials
Merge pull request #7 from lvl0nax/footer_partials

adding footer partials
Merge pull request #8 from Neodelf/dev

added conditions
add app/admin/banner.rb
after merge
fix
Merge pull request #9 from Neodelf/layout_conditions

added csses, route, start makeup
add app/admin/banner.rb
Merge branch 'dev' of github.com:lvl0nax/topaza_shop into backend_banners
added show for banners
added orders
adding front-end for dress show
Merge pull request #12 from lvl0nax/dress_show

adding front-end for dress show
Merge branch 'dev' of github.com:lvl0nax/topaza_shop into backend_order

Conflicts:
	app/models/banner.rb
Merge branch 'dev' of github.com:lvl0nax/topaza_shop into backend_banners

Conflicts:
	app/models/banner.rb
added layout
Merge pull request #13 from Neodelf/layout_conditions

added layout
adding fix for dress description