updates
Merge branch 'develop' of https://github.com/cs56inventory/Inventory into develop