I didn't even open it, but git wants me to commit
Merge branch 'master' of https://github.com/nhetrick/MachineShop
Merge branch 'master' of https://github.com/nhetrick/MachineShop
removed comments