test
Merge branch 'master' of https://github.com/Alex0x47/ChallengeYourFriend

Conflicts:
	application/controllers/GererUtilisateurController.php