ajout d'un utilisateur
Merge branch 'master' of https://github.com/neowutran/projetFinalSI3

Conflicts:
	MiniProject/data.json
	log.xml.1
	src/views/etat/Administrator.java