Updated my fork!

Conflicts:
	ShiftOS.Engine/ShiftOS.Engine.csproj
	ShiftOS.Engine/Terminal/Commands/Hello.cs
	ShiftOS.Engine/Terminal/TerminalBackend.cs
	ShiftOS.Engine/Terminal/TerminalCommand.cs
	ShiftOS.Main/ShiftOS.Main.csproj
	ShiftOS.Main/ShiftOS/Apps/Terminal.cs
	ShiftOS.Main/ShiftOS/Desktop.cs

1 files changed, 14 insertions, 17 deletions

diff --git a/ShiftOS.Main/Program.cs b/ShiftOS.Main/Program.cs
index 10277b0..f7c00eb 100644
--- a/ShiftOS.Main/Program.cs
+++ b/ShiftOS.Main/Program.cs
@@ -1,24 +1,21 @@
 using System;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using ShiftOS.Main.ShiftOS;
 
 namespace ShiftOS.Main
 {
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
+	static class Program
+	{
+		/// <summary>
+		///     The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main()
+		{
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
 
-			Parallel.Invoke(
-				() => Application.Run(new TestForm()),
-				() => Application.Run(new Desktop()));
-        }
-    }
-}
+			Application.Run(new Desktop());
+		}
+	}
+}
\ No newline at end of file