Bug fix + jump + score points + health points
merge conflict