ajout des conventions
mergecMerge branch 'master' of https://github.com/geeknbar/projet_msn