Merge pull request #8 from aguibert/master

andys fixes
Merge pull request #9 from aguibert/master

Lucas;s stuff I1
UI code plus some small fixes
another small fix
merge fix
Merge branch 'master' of https://github.com/aguibert/COMS362 into aguibert-master

Conflicts:
	ShippingSystem/UserInterface/CommandLineInterface/CLI.java
merge fixes 2
final I1
small fixes
more fixes
Merge pull request #4 from jdmielke/master

Jon I1