merging

Merge branch 'master' of https://github.com/SquareBracketAssociates/PharoByExample-french
Merge branch 'master' of https://github.com/SquareBracketAssociates/PharoByExample-french