fixed conflicts and merged master
Setting up Google Places

  *added httparty, google_places, dot_env gems
  *created place model
  *wrote an integration test to TDD this feature
wrote request method that works
Implemented Place#get_names method(trello #2)

  *cleaned up factories
  *refactored initialize to take the parameters instead of request taking the parameters
  *get_names method parses data and returns a list of business names
Implemented Place#get_addresses with passing unit test
Refactored Place and spec

  *request_businesses is only called once
  *refactored tests to match
Refactored Place

  * combined methods to return an array of hashes of names and addresses
  * refactored spec to match
  * put request_businesses into private methods
Adding session[:trip_id](trello #2)

  * setting up options controller to use :trip_id to retrieve Place
  * Home page (trip#new) reset :trip_id to nil
Calculating duration for trip with an errand

* using Google Directions Service to calculate each errand's addition
  to total trip time
Implemented DirectionsServiceHelper

  *it can make an api call
  *we can parse the response and get the new duration for up to 8 waypoints
  *waypoints must be passed in as an array of addresses(strings)
removed a few syntax errors, specs still passing
added some comments in distance_matrix_helper for reference
Wrote a unit test for DirectionsServiceHelper

  *stubbed out api call and debugged stub
  *refactored DirectionsServiceHelper code to more effectively assign responsibilities
Trips/Places housekeeping (Trello #2)

* replace Rails form_tag with html
* start to find Place with Spots on options/index
merged master and fixed tests to match changes in code
fixed foundation bug
fixed rank_by bug
OptionsController#index can display businesses and info

  *wrote index action
  *implemented Business helper model
  *refactored place.rb to only return two results
OptionsController#index displays 4 businesses

  *2 from start point and 2 from end point
  *extracted index action logic to a private method
added selection form for choosing business