3 trips_controller#show specs passing
Merge branch 'master' into trips_controller_spec
Merge pull request #60 from LightningLord/trips_controller_spec

Trips controller spec