Add CORRECT method for calculating duration.
Merge branch 'master' into calculate-trip-time

Conflicts:
	train.rb