merge mercredi soir week 2

Conflicts:
	src/java/servlet/Controleur.java