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

Conflicts:
	PolyQuizz/WebContent/Connected_Zone/invitation.jsp
	PolyQuizz/src/modele/PartieRepository.java