Merge branch 'master' into grading-modules

* master:
  JSON files
Merge branch 'grading-modules' of https://github.com/JFrei86/HWserver into grading-modules

# By Jesse Freitas (4) and others
# Via Chris Berger (5) and Jesse Freitas (3)
* 'grading-modules' of https://github.com/JFrei86/HWserver:
  missing return statement for some reason in searchToken.h
  Commented diffNaive.h and added single token search algorithm
  removed warnings in diffNaive.h
  fixed diffLine and diffLineNoSpace to behave more similarly to the Myer's Difference JSON Output.
  Add uploading files
  Minor validation fixes
  Remove bloat code in HWTemplate
  More minor fixes to validator