renamed trip_controller.rb
Merge remote-tracking branch 'origin/master'
working background jobs
Merge pull request #30 from th7/background_jobs

Background jobs