changer par Guokan SHANG
Merge branch 'master' of https://github.com/benel/TP-Git
2ieme moidification
Conflicts:
	README.md
Merge pull request #34 from shangguokan/master

Ajout de G. Shang.
conflit