fix conflict on trip_spec.rb
Merge pull request #2 from Lrmanfre/feature/ajax-append-trip-name-to-sidebar

Feature/ajax append trip name to sidebar