create class Building in building.rb
Added trip_duration method to train
Merge remote-tracking branch 'origin/master' into calculate_trip_time

Conflicts:
	train.rb
Fix trip_duration bug.
Merge pull request #1 from caldwelljs/calculate_trip_time

Calculate trip time