Add calculation for trip duration
Merge remote-tracking branch 'origin/master' into calculate-trip-time

Conflicts:
	train.rb
Foxmg bug
Merge pull request #1 from RealTschoegl/calculate-trip-time

Calculate trip time