yo
Merge branch 'master' of https://github.com/Celianam/poly-quizz

Conflicts:
	PolyQuizz/WebContent/connexion.jsp
	PolyQuizz/WebContent/inscription.jsp