resolved merge conflict
resolved merge conflicts
started implementation of MD5 in traffic_spy.rb
Merge branch 'master' of github.com:gschorkopf/traffic_spy
added URL Requests html to data.erb file
Resolved merge conflicts
added userAgent to views in data.erb
resolved merge conflicts