branche créée
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
 resolution conflit
Merge branch 'laurianne'