diff viewer higlight fixes attempt 2
resolves merge conflict
typo in zip
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWServer into Master-both
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWServer into origin/Master-both
Merge branch 'Master-both' into origin/Master-both
typo in update.php
Fixes undefined reference in diff viewer code, fixes backslash character escape
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWServer into origin/Master-both
diff panels fill with scroll bar for extra wide text
grading script in parallel, misc other stuff
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWserver into origin/Master-both
apparently document.getElementById doesn't work with the spaces escaped
revising testcase interface
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWserver into origin/Master-both
revising TestCase.h & front end a bit
revised TestCase points data structure
moves space escapes to exclusively the display call
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWServer into origin/Master-both
Merge branch 'origin/Master-both' into develop

* origin/Master-both:
  moves space escapes to exclusively the display call
  revised TestCase points data structure
  revising TestCase.h & front end a bit
  revising testcase interface
  apparently document.getElementById doesn't work with the spaces escaped
  grading script in parallel, misc other stuff
  diff panels fill with scroll bar for extra wide text
  Fixes undefined reference in diff viewer code, fixes backslash character escape
  typo in update.php
  typo in zip
  diff viewer higlight fixes attempt 2