a
Merge remote-tracking branch 'refs/remotes/origin/Applic_News' into Applic_News
ajout recherche
Merge remote-tracking branch 'refs/remotes/origin/Applic_News' into Applic_News

Conflicts:
	src/Applic_Salle/Applic_Salle.java