Merge pull request #1 from AS-2013-2014/master

Coucou
Merge pull request #2 from AS-2013-2014/test2

Merge pull request #1 from AS-2013-2014/master