Merge pull request #22 from mamio/master

Waiting time before play to prepare yourself for war! GRAWR!
Ajout de vies et de briquesspeciales
fixed merge conflicts
Merge pull request #24 from ming0719/master

Ajout de vies et de briques speciales
background+menage bouton + augmente vitesse