Edited my Gemfile.lcok
Ignore .elasticbeanstalk from Git
James
Added helper and model for G maps
Merged with James include GeoCode. Nil Class error
Revised James merge. Fixed get_route_points calling
new stuff
changed to googlemapshelper for James
added Jame's proposed changes
Merged James' branch. seems ok
commented out algorithm under construction
commented wrong part
Merge branch 'Edbert'

Conflicts:
	.idea/workspace.xml
	app/controllers/get_restaurant_lists_controller.rb
	app/helpers/google_maps_helper.rb