Article 7
Article 6
Modification de l'article 3
Merge https://github.com/Cioum/TP3

Conflicts:
	index.html
Merge pull request #8 from guillaumeducrocq/master

ajout article 7
Merge https://github.com/Cioum/TP3

Conflicts:
	index.html
Merge https://github.com/Cioum/TP3
Merge pull request #10 from NgBoy/master

article 6
Merge pull request #9 from Jordan-vaillant/master

deuxième article nexus 7
Merge branch 'master' of https://github.com/Cioum/TP3
Merge pull request #11 from Simon-Moncomble/master

Article 3