added onlineOrder merging time
Merge https://github.com/WindCalibur/cs304

Conflicts:
	src/Warehouse.java