Added back stops.json
Merge remote-tracking branch 'origin/master'
Return our actual result for the stops within short trip range.