Updated UI.
UI tweaks
Merge branch 'seth' of https://github.com/jr-news/cop5339

Conflicts:
	src/shoppingCart/UI.java
Various changes
Merge remote-tracking branch 'origin/master' into newman
Merge branch 'newman' of https://github.com/jr-news/cop5339.git into newman