revised controllers
started inventory management
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/layouts/layout.php
inventory_changes
inventory changes
inventory changes
inventory changed
Merge pull request #22 from mhender24/master

inventory
index on master: a476dd5 update - auto assign labaides
WIP on master: a476dd5 update - auto assign labaides
Merge remote-tracking branch 'upstream/master'
updating again