still searching...
Merge branch 'master' of https://github.com/Ariekor/OurFisrtServlet

Conflicts:
	EshoppeWeb/src/java/EshoppeWeb/Catalogue.java