Merge https://github.com/alexisjouenMMIA1/TP3
Merge pull request #2 from alexisjouenMMIA1/master

Article Inès Blanjard
Merge pull request #12 from blanjardinesmmi1a1/master

Article Inès Blanjard
ajout affiche films
Merge pull request #13 from philippe-sauvage-mmi1a2/master

phil ajout affiche film
edward
edward
Merge pull request #14 from MottierBastienMMI1A2/master

edward
modif
modif article xmen
Merge pull request #15 from bryandelahayeMMI1a1/master

modif article xmen
Merge https://github.com/alexisjouenMMIA1/TP3
Merge pull request #16 from bryandelahayeMMI1a1/master

modif (bouton enlevé) article xmen
bouton qui ne marche pas enlevé
modif position image et article dans html
Merge pull request #17 from philippe-sauvage-mmi1a2/master

modif position image et article dans html
Merge https://github.com/alexisjouenMMIA1/TP3
Merge pull request #18 from MoLisa/master

changement de texte
Merge pull request #19 from DuvauchelleMarvynMMI1A1/master

modif
Merge pull request #20 from MoLisa/master

ajout bande annonce