Merge pull request #1 from tpoisot/master

modifs tim
Merge pull request #2 from tpoisot/master

Addition of box2
Merge pull request #3 from tpoisot/master

modifs tim
Minor edits
Merge pull request #7 from DominiqueGravel/master

Minor edits to the ms