Merge branch 'master' of github.com:RoboJackets/inventory-management

Conflicts:
	README.md