adding new database connection
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By Bonnie
# Via Bonnie
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  merge conflict resolved
  Products Linked to Database

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

# By Bonnie
# Via Bonnie
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  Changed logo link in header