working sql

JDBC connection and queries
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebShopGit/WebContent/startPage.jsp
	WebShopGit/src/DB/User.java