Commit
Merge branch 'master' of https://github.com/mamadidabo/projetPro.git

Conflicts:
	WebContent/satrennespagui_javascript/examples.js
Example Commit