Changed John's CWID
Merge branch 'master' of https://github.com/nhetrick/MachineShop
Fixed return tool errors
Merge branch 'master' of https://github.com/nhetrick/MachineShop