Implementing Search for businesses(trello#2)

  *added show method to TripsController
  *created trips#show view
  *still trying to get integration test to pass
One options integration test passing
  *implemented OptionsController#index
  *implemented form_tag in trips/show view
  *updated spec
one OptionsController test passing
Implemented Foundation css framework

  *Installed foundation
  *Added some classes to trips/show view
fixed conflicts and merged master
fixed merge conflict in gemfile.lock:
ran bundle and committed gemfile.lock
Merge pull request #13 from LightningLord/install-foundation

Install foundation