Added buiding class to building.rb
Added trip_duration method to Train class
Merge remote-tracking branch 'origin/master' into calculate_trip_time

Conflicts:
	train.rb
changed trip_duration from distance * speed to distance / speed
Merge pull request #1 from tdubb/calculate_trip_time

Calculate trip time