Merge pull request #1 from rosskinney/calculate_trip_time

Calculate trip time