Article 6
Merge https://github.com/Cioum/TP3

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

article 6