Nav css cleanup
Top nav refinement
Consolidate top nav markup
Merge branch 'master' into left-nav-slide

top nav and slider

Conflicts:
	assets/css/main.css
	assets/css/main.css.map
	assets/scss/.sass-cache/61fa33e170e8087dfb025d5b97227c5faba7f958/main.scssc
	assets/scss/.sass-cache/7291098d3abac1bebb37cb82f655578f82f3f832/_nav.scssc
	assets/scss/components/_nav.scss
	products.html
top nav fix