gitignore
Merge branch 'master' of https://github.com/StephaneWutke/20Zgondes

Conflicts:
	.gitignore
	.settings/org.eclipse.wst.common.component
	WebContent/WEB-INF/jsp/result.jsp