Lots of updates to the UI. Most things in place, ready to start integrating. Still messy
Merge branch 'master' of https://github.com/BlightOfYou/a2

Conflicts:
	src/Phase2/src/edu/cmu/a2/ui/ShippingMainFrame.java

Had to merge shippingMainFrame#
Updated login and shipping frame