The columns with the products now work
Merge branch 'master' of https://github.com/vegaro/cse_135_project

Conflicts:
	cse135/WebContent/dashboard.jsp