Fixed conflicts
Merge pull request #17 from HallCat/extraGUI

Fixed conflicts
Add floor changes
Merge pull request #18 from HallCat/workerRefactor

Refactor of workers
Conflicts
Merge branch 'master' of https://github.com/HallCat/WithoutThem
Implemeting Liam's Changes w/ GUI
Added the update for products
Merge pull request #20 from HallCat/updateProductGUI

Added the update for products
Was working on the products updating
Merge branch 'master' of https://github.com/HallCat/WithoutThem into commentBranch
Comments on code and clean up
Merge pull request #22 from HallCat/commentBranch

Comment branch
changes
conflicts
conflicts
conflict
conflicts