fix slider
hmm
hmm
Merge branch 'Dev'

Conflicts:
	css/main.css.map
	css/plugins.css
	css/plugins.css.map
	index.html
	sass/plugin/_flexslider.scss