mega commit
change score and life values
commit kaoune
tamere
fix conflict