(372c6e60a) More automatic text scaling + merge fix

Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs

@@ -4,7 +4,6 @@ using Barotrauma.Tutorials;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -765,8 +764,6 @@ namespace Barotrauma
 
             GUI.Draw(Cam, spriteBatch);
 
-            GUI.Draw(Cam, spriteBatch);
-            
 #if DEBUG
             GUI.Font.DrawString(spriteBatch, "Barotrauma v" + GameMain.Version + " (debug build)", new Vector2(10, GameMain.GraphicsHeight - 20), Color.White);
 #else
@@ -842,7 +839,6 @@ namespace Barotrauma
                 GameModePreset.List.Find(g => g.Identifier == "singleplayercampaign"));
             (GameMain.GameSession.GameMode as CampaignMode).GenerateMap(mapSeed);
 
-
             GameMain.LobbyScreen.Select();
         }