Correction des erreurs mineurs
resolution des conflicts
Merge branch 'master' of http://github.com/LeonardoALARCON/progr3