add trip_distane method
Merge remote-tracking branch 'origin/master' into calculate-trip-time

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

Calculate trip time