fix for iphone mess
Banner work progress - desktop
Merge branch 'master' of https://github.com/howardboland/knock2win

Conflicts:
	app/styles/partials/_scaffold.scss