Added more code to pull User Fruits from DB

Added more code to pull User Fruits from DB and pulpulate Market.jsp
Added so more stypes to glam Market.jsp
Merge branch 'master' of https://github.com/bigpolish7/jhu-plantgame

Conflicts:
	src/java/plantgame/models/Market.java
	src/java/plantgame/utils/Fruits.java
	web/Market.jsp