Added Categories with Subcategories
commit local web.xml
Merge branch 'master' of https://github.com/slovit/bestbuy

Conflicts:
	WebContent/WEB-INF/web.xml
	src/ca/bestbuy/remix/Remix.java