Here is the updated Inventory.cpp
Merge branch 'Justin' of https://github.com/JPSRob/Restaurant into Justin

Conflicts:
	Inventory.cpp