Merge branch 'grading-modules' of https://github.com/JFrei86/HWserver

* 'grading-modules' of https://github.com/JFrei86/HWserver:
  slight JSON update for a to correspond to student and b to correspond to instructor
  changed variable name to avoid conflict
  fixed semicolon
  Added JSON output for secondary diff
  added comments and edited attribution
  Secondary Diff working- call ses(a, b, true) to enable
  Added basic JSON output for line differences
  added beginning of JSON output
Fixed template issue for vectors of vectors
added code to read in file contents and added headers to the modules header file
Added file to run mass diffs on files
Merge branch 'master' of https://github.com/JFrei86/HWserver into grading-modules

* 'master' of https://github.com/JFrei86/HWserver:
  Added file to run mass diffs on files
  added code to read in file contents and added headers to the modules header file
  Fixed template issue for vectors of vectors