Merge pull request #1 from tdubb/calculate_trip_time

Calculate trip time