Red conflict dots + size normalization tweak
Merge branch 'master' of github.com:JonathanClark11/CPSC410Team24