Merge branch 'master' of http://github.com/JFrei86/HWserver into validator
fixed diffNaive accuracy
resolved merge issues
added runDiff
Fixed JSON
DiffNaive is now a helper, added DiffLine for taking the difference per line. PrintJSON now takes ostream instead of ofstream. Minor changes to tokenSearch.h
Changed Difference to non-templates class and added metadata class
printJson is now member of difference class
small changes for outputting JSON
Minor validation fixes
Merge branch 'grading-modules' of http://github.com/JFrei86/HWserver into validator
Merge branch 'grading-modules' of http://github.com/JFrei86/HWserver into validator
Merged new difference class changes and diffNaive changes.
fixed compiliation errors from merge. semantic errors found in diffLine when testing
fixed diffLine and diffNoSpace to use the Difference Class
fixed diffLine and diffLineNoSpace to behave more similarly to the Myer's Difference JSON Output.
Fixed conflicts