Resolving pull issues.
Merge branch 'master' of https://github.com/discobots2587/disco-frc
Fixed incompatible type issues.