git
Merge branch 'master' of https://github.com/BorowczykMorganneMMI1A2/TP2

Conflicts:
	style.css
maj
page sport
Merge pull request #4 from DuvauchelleMarvynMMI1A1/master

page sport
CHange texte
Change texte
Merge branch 'master' of https://github.com/BorowczykMorganneMMI1A2/TP2
ajout fichier texte
article
Merge pull request #2 from MottierBastienMMI1A2/master

article_hannibal
Merge pull request #1 from WintrebertBenjaminMMI1A2/master

articleGOT sujet série
Mise a jour
Merge branch 'master' of https://github.com/TrinelRaphael1A2/TP2
texte heroes
Merge branch 'master' of https://github.com/TrinelRaphael1A2/TP2 into upstream