Deleted some extraenous stuff from Chris's commit
Merge branch 'team1-dev' of github.com:cmdunkers/wpi-suite-tng into team1-dev