Did some changes...
Now the player can die!
Merge branch 'animation'