Junk
Fixed merge conflicts
In progress
Merge branch 'master' of https://github.com/araichev/gtfs-segments
In progress