un-commented out cancel
Merge branch 'dev-set3-iteration2' of github.com:333fred/wpi-suite-tng into dev-set3-iteration2