hidden & extra credit test case inconsistency
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWserver into origin/Master-both
tweaks to lab1