Signed-off-by: Matthieu <zombie7578@hotmail.fr>
Merge https://github.com/ISNTeamDumezil/dames
Signed-off-by: Matthieu <zombie7578@hotmail.fr>
Signed-off-by: Matthieu <zombie7578@hotmail.fr>
Merge branch 'master' of https://github.com/ISNTeamDumezil/dames

Conflicts:
	fonction.py

Signed-off-by: Matthieu <zombie7578@hotmail.fr>