Add Train#calculate_trip_duration.
Merge remote-tracking branch 'origin/master' into calculate-trip-time

Conflicts:
	train.rb
fixed math bug in trip duration
Merge pull request #1 from fremn/calculate-trip-time

Calculate trip time