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

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

Calculate trip time