added yellow boxes for tasks
fixed merge issues
Merge branch 'team1-dev' of github.com:cmdunkers/wpi-suite-tng into team1-dev