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
edit
Jeuxvideo.html
Merge branch 'master' of https://github.com/mmi1c1/TP2
add series.html
Merge pull request #9 from Raphael-Richard-MMI1C2/master

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

Sherlock
Ajout du theme musique
Merge pull request #10 from rubing/master

Ajout du theme musique
Merge pull request #2 from JustineCressonMMI1C2/master

got
Dexter
remove films.html
Merge pull request #3 from mmi1c1/master

Dexter
add series.html
add series.html