Game Over fade

- Added shading transition to game over screen
- Fixed merge error