Small merge

Combined the player death and respawn with gravity and level
improvements.