More minor fixes to validator
Remove bloat code in HWTemplate

Removed code for automatic cout_check in HWTemplate.h, will put in
validator files.
Validator fixes
Merge branch 'master' of http://github.com/JFrei86/HWserver into validator
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
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
Add uploading files

Just adding files to start working on uploading (mostly for Research
Symposium Demo).  No guarantee everything works properly yet.
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
Merge branch 'web-dev' of https://github.com/JFrei86/hwserver
Merge branch 'validator' of https://github.com/JFrei86/hwserver