updated trips#show
Merge branch 'master' of github.com:pantsonsteven/bike_app