resolved merge conflicts
Merge branch 'master' of github.com:gschorkopf/traffic_spy
added views for browser, os, screen rez, response time in data.erb
resolved merge conflicts