Changed trip_controller.rb
Merge branch 'master' of https://github.com/khalua/travlr
Added javascript functions to st-trip.js
Merge branch 'master' of https://github.com/khalua/travlr
Added to the trips_controller.rb a bunch of actions
Merge branch 'master' of https://github.com/khalua/travlr