commit all the things!!
commiting through shell
Merge branch 'master' of https://github.com/tomasvalettini/SOEN487Assignment3

Conflicts:
	ManufacturerClient/nbproject/private/private.xml
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/GetProductInfo.class
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/ProcessPurchasePrderResponse.class
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/Product.class
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/PurchaseOrder.class
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/ReceivePayment.class
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/ReceivePaymentResponse.class
	Retailer/build/web/WEB-INF/classes/org/me/manufacturer/package-info.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/ObjectFactory.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/OrderItem.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/ShipGoods.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/ShipGoodsResponse.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/WarehouseWS.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/WarehouseWS_Service.class
	Retailer/build/web/WEB-INF/classes/org/me/warehouse/package-info.class
	Warehouse1/build/generated-sources/jax-ws/org/me/manufacturer/ManufacturerWS.java
	Warehouse1/build/generated/jax-wsCache/ManufacturerWS/org/me/manufacturer/ManufacturerWS.java
	Warehouse1/build/web/WEB-INF/classes/org/me/manufacturer/ManufacturerWS_Service.class
	Warehouse1/build/web/WEB-INF/glassfish-web.xml
	Warehouse1/nbproject/private/private.properties