Pull
Ecriture Jeu et Tama
Merge branch 'master' of https://github.com/fiilma/SimsTama

Conflicts:
	SimsTama/src/simstama/EtreVivant.java
Test Jeu