resolution conflits
modification pageGM
resolution des conflits
ajout de la page info admin
Merge pull request #13 from garciafl/brlegran/v2

Brlegran/v2