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

Conflicts:
	train.rb

"merged commits"
fixed bug
Merge pull request #1 from wleverett/calculate-trip-time

Calculate trip time