nothing do it
Merge remote-tracking branch 'origin/master' into fallou

Conflicts:
	src/javafx/home/HomeController.java
Merge remote-tracking branch 'moussa/fallou'

Conflicts:
	.classpath
	src/javafx/membre/ajout/AjouterMembreController.java