Funnel New CSS
Merge branch 'master' of https://github.com/tourismwhistler/2014

Conflicts:
	css/main-cart.css
	scss/partials/_header.scss