Merge branch 'master' of github.com:dhoko/takingtome into checkValuesMethodsandevenlisteners
le jeu marche
design
fix conflict