Added game over screen and refreshed gui behaviour
Fixed merge conflict