Merge pull request #62 from garzgul/master

merge de mercredi soir
Merge pull request #63 from garzgul/Emmanuelle

Merge pull request #62 from garzgul/master