Actualisation
Merge branch 'master' of https://github.com/plemanh/PJL2013

Conflicts:
	test.py
Ce script fonctionne
Mardimatin
Mardim