calculate the time for trip of a certain distance
Merge remote-tracking branch 'origin/master' into calculate-trip-time

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

Calculate trip time