Sanitation tooling
fix merge conflict in gemfile - missing end
Merge branch 'master' of github.com:danny-g/traffic_spy