Refactoring GUI
fixed merge errors
Merge branch 'master' of https://github.com/nhetrick/MachineShop
Merged