Changing the categories page to include delete buttons, updated categories SQL
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By Bonnie
# Via Bonnie
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  Added category menu on category and product page
  index.jsp Cosmetic Changes
  Session role casting as string bug fixed

Conflicts:
	WebContent/categories.jsp
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By vpcombo
# Via vpcombo
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  product order
Implemented add, delete categories