table reworked and controller function worked on
worked on delete function
updating
Merge pull request #1 from Mallics/master

To put project on dev
worked on user functions and refactoring
updated controller and added create categories for front end
Merge pull request #2 from mhender24/master

inventory update
index on master: 74e8a8a updating
WIP on master: 74e8a8a updating
Merge commit 'stash'
Inventory Stuffs
Fixed merge issues?
Fixed merge errors
Fixed merge issues
Fixed merge issues
Hopefully Fixes
Fixed old file issues
Merge pull request #3 from csalajan/master

Inventory Management
index on master: 95f3fb4 Merge commit 'stash'
WIP on master: 95f3fb4 Merge commit 'stash'