Go
Merge branch 'master' of git@github.com:georgeherby/Totalitea.git

Conflicts:
	Totalitea/WebContent/Basket.jsp