Add trip_duration method
Merge remote-tracking branch 'origin/master' into calculate_trip_time

Conflicts:
	train.rb

Merged calculate_trip_time and origin.
Fixing bug.
Merge pull request #1 from bird-man-jr/calculate_trip_time

Calculate trip time