The app now displays a list of London areas that feature parking spaces
Location show page now displays a map of the current location
Merge branch 'master' of https://github.com/Reyko/FinalProject-WeGotCoders

Conflicts:
	Gemfile
	app/assets/stylesheets/locations.css.scss
	app/assets/stylesheets/main.css.scss
	app/models/location.rb
	app/views/locations/index.html.erb
	app/views/locations/show.html.erb
	db/schema.rb
	spec/models/location_spec.rb
fixed a conflict from merge