Fixing colors
Removing excessive weeks
Merge branch 'dev' of github.com:cs3733-team4/wpi-suite into dev