mes commentaires
Merge branch 'master' of ssh://github/Carreau/test-sylvain

Conflicts:
	main.py