Added logic to trip index
Fixing merge conflict
Working on trips controller, trips/show page