Merge pull request #1 from caldwelljs/calculate_trip_time

Calculate trip time