First commit of main layout
fixed conflict in routes.rb
Removed nokogiri
Added distance api
Added "address to coordinates" functionality
Merge branch 'main-layout' of https://github.com/pjskennedy/groc into main-layout
Removed duplicate google maps API
made api more concrete
Merge branct push h 'main-layout' of github.com:pjskennedy/groc into main-layout
patched version
Added full app
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
Integrated ashkans changes
finished app
Merge pull request #6 from pjskennedy/main-layout

Main layout