writing hour by day method
fixed merge files
two failing tests, server_spec and results_spec
changed hour by day to hour by event
Merge branch 'master' of github.com:chelseakomlo/traffic_spy