cleaning up router.rb
removing json code
cleanup
fixed merge conflicts
Merge branch 'master' of github.com:thesteady/traffic_spy
fixed long lines