Add calculation for time a trip will take in hours
Merge remote-tracking branch 'origin/master' into calculate-trip-time

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

Calculate trip time