sons et modal vide
conflict solved2
Merge branch 'master' of https://github.com/fabiop80/TP_Canvas

Conflicts:
	scripts.js