frise améliorée
test2
nettoyage .orig
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	screenFreebusyRoom.js
frise améliorée