added trip duration method.
Merge remote-tracking branch 'origin/master' into calculate-trip-time

Conflicts:
	train.rb
added .orig file
Merge pull request #1 from tinasoul/calculate-trip-time

Calculate trip time