test conflit 2
Merge branch 'master' of https://github.com/YvesKamdjo/Ecran-en-Lecture-Ecriture-Mobile

Conflicts:
	screenFreebusy.js