Removed all extraneous commented-out code
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5