Squashed commit of the following:

commit 4b8e17b5359c770dbd4b630bdaf07a029ecb0920
Author: LesleyMdCampo <lesliz32@gmail.com>
Date:   Fri Dec 6 15:30:29 2013 -0600

    Add trip_distance method.

commit 2523793c15521dba45546970ad727ac06d67019e
Author: LesleyMdCampo <lesliz32@gmail.com>
Date:   Fri Dec 6 15:21:56 2013 -0600

    Fixing bug.

commit 9204709be1d712b900ab0d8b6b31734a6ca74753
Author: LesleyMdCampo <lesliz32@gmail.com>
Date:   Fri Dec 6 15:21:03 2013 -0600

    Fixing bug.

commit 78233f4dd7ddcc289ec479aaeef9562b230ac5c9
Merge: a058e00 6248977
Author: MakerSquare Student <students@themakersquare.com>
Date:   Fri Dec 6 15:11:48 2013 -0600

    Merge remote-tracking branch 'origin/master' into calculate_trip_time

    Conflicts:
    	train.rb

commit a058e0090d31b405fff85f76800892b7623c50b8
Author: MakerSquare Student <students@themakersquare.com>
Date:   Fri Dec 6 15:01:54 2013 -0600

    added trip duration method

commit 3bc2a5b39af3eba8bf885c7a24a1ba2dab603aaa
Author: LesleyMdCampo <lesliz32@gmail.com>
Date:   Fri Dec 6 14:55:07 2013 -0600

    Add building class.