Basically finished interface for choosing location
Merge branch 'main-layout' of https://github.com/pjskennedy/groc into main-layout
fixed conflicts too
Conflicts:
	app/assets/stylesheets/deals.css.scss