111
Merge branch 'master' of https://github.com/InternetFarmer/DatabaseProject

Conflicts:
	nbproject/private/private.xml
	web/JSP/startShopping.jsp