Changes
Main menu and player dead
Hard merge