fixed a get error
merging error fixes
Merge branch 'master' of github.com:thesteady/traffic_spy