bla
Jeuxvideo.html
Merge branch 'master' of https://github.com/mmi1c1/TP2
Ajout Fichier Manga.html

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

Conflicts:
	style.css
Merge pull request #7 from Raphael-Richard-MMI1C2/master

ajout jeux video
Merge branch 'master' of https://github.com/mmi1c1/TP2
modification de ma partie clelia
redaction de l'article
Modification de la partie de Rémi
redaction
Jeuxvideo.html
Merge branch 'master' of https://github.com/mmi1c1/TP2
Merge pull request #9 from Raphael-Richard-MMI1C2/master

ajout jeux video modifier
Merge pull request #1 from denoeudcleliammi1c1/master

clelia
Merge pull request #2 from MimardC1/master

redac chloé
Ajout du theme musique
Merge pull request #10 from rubing/master

Ajout du theme musique
Merge pull request #4 from lauriehibon1c2/master

redaction
correction
Merge pull request #12 from MatheRemi1C1/master

Modification de la partie de Rémi