Merge pull request #1 from hugodes/gamestates

Gamestates
Merge pull request #2 from hugodes/death

Death
Merge branch 'master' into death