Merge branch 'master' into StructPions

Conflicts:
	lib/Pion.py

lib/Pion.py

@@ -10,9 +10,14 @@ from Creature import Creature
 from Forme import Forme
 from outilsSvg import *
 
+<<<<<<< HEAD
 def fctBidon():
     return "salut!!"
 
+=======
+def fctBidon2():
+    return "au revoir!"
+>>>>>>> master
 
 class Pion(QGraphicsItem):
     """pion du plateau de combat"""