test2
nettoyage .orig
test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	screenFreebusy.js