Merge branch 'master' into Lunaria

* master:
  Signed-off-by: Lunaria <goro27@hotmail.fr>
  Delete testbranch
  testbranch

Conflicts:
	Main.py

Signed-off-by: Lunaria <goro27@hotmail.fr>
Signed-off-by: Lunaria <goro27@hotmail.fr>
Merge branch 'Lunaria'

Conflicts:
	Main.py
	Objet.py
ajout du code de quentin. j'ai mis des com car ça marche pas oO