Merge branch 'trip_class' into devel
Started working on stop_times
Merge branch 'devel' of github.com:magikid/wheels-on-the-bus into devel