c'est la modif de jan
Merge branch 'master' of https://github.com/frouyer193/lasdesas

Conflicts:
	l'as_des_as.py
Merge branch 'master' of https://github.com/frouyer193/lasdesas