davismartin/traintastic — pull request #1 by chrisbodhi (2013-12-06 17:41:22+00:00)
Title: Calculate trip time

Fix merge conflict after adding methods.