Hmm
Power of panic
Merge branch 'master' of https://github.com/WindCalibur/cs304

Conflicts:
	src/Warehouse.java