Merge pull request #7 from aguibert/master

Update with Andy's PR
Merge branch 'master' of https://github.com/lrohret/COMS362

Conflicts:
	ShippingSystem/config.properties
	ShippingSystem/src/system/truck/TruckImpl.java
	ShippingSystem/src/system/truck/TruckManagerImpl.java
MOre
Merge branch 'master' of https://github.com/lrohret/COMS362

Conflicts:
	ShippingSystem/config.properties
	ShippingSystem/src/system/truck/TruckManagerImpl.java
Finished Iteration 1 Truck
Merge pull request #8 from aguibert/master

I2: Customer marks package damaged
Fixed probs brah IT1 TTTTTruck
Merge pull request #5 from lrohret/master

Finished Iteration 1 for Truck