Initial final build
Merge branch 'master' of https://github.com/jarylc/Inventory-System