got rid of the merge headers in a few html files
Merge branch 'dev-set3-iteration4' of github.com:333fred/wpi-suite-tng into dev-set3-iteration4