Fixed the funky charts classes issues, sorry
Merge branch 'dev-set3-iteration4' of github.com:333fred/wpi-suite-tng into dev-set3-iteration4
fixed merge issues with fix