a
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/Applic_Salle/Applic_Salle.java