Ajout de l'article
Modification général
Merge branch 'master' of https://github.com/CressonQuentinB1/TP3

Conflicts:
	index.html
Ajout article
ModificationMerge branch 'master' of https://github.com/CressonQuentinB1/TP3
Merge branch 'master' of https://github.com/CressonQuentinB1/TP3
Merge branch 'master' of https://github.com/CressonQuentinB1/TP3
fdshkjdohjrto Merge branch 'master' of https://github.com/BRMMIB1/TP3

Conflicts:
	index.html
Merge pull request #6 from BRMMIB1/master

Envoie article