Modif css
ajout de l'article 9
Rajout de l'article 10 tablette archos 101 xs
Merge pull request #1 from DamienVienne/master

Rajout du 10ème article
Article 7
Article 6
Merge pull request #2 from yannkubacki/master

ajout article 9 yann kubacki
Modification de l'article 3
Merge pull request #5 from MachenRemi/master

Title / Edito / Article 1 Machen Rémi
coucou
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
ajout second article
Merge pull request #9 from Jordan-vaillant/master

deuxième article nexus 7
j'ai changé l'article 5 en article sur l'acer ICONIAMerge branch 'master' of https://github.com/Cioum/TP3
Merge branch 'master' of https://github.com/Cioum/TP3
Merge pull request #11 from Simon-Moncomble/master

Article 3