cc
Merge branch 'master' of https://github.com/Thibault-Brun/Split-ivity

Conflicts:
	js/ajouterPersonne.js