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, 19 insertions, 20 deletions

diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
index 389f8d1..a0c12c0 100644
--- a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
@@ -1,28 +1,27 @@
 using System;
-using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
-using ShiftOS.Engine;
+using ShiftOS.Engine.Misc;
 using ShiftOS.Engine.WindowManager;
-using ShiftOS.Main.ShiftOS.Apps;
+using ShiftOS.Main.Properties;
+using ShiftOS.Main.ShiftOS.Apps.ShifterStuff;
 
-namespace ShiftOS.Main
+namespace ShiftOS.Main.ShiftOS.Apps
 {
-    public partial class TestForm : Form
-    {
-        public TestForm()
-        {
-            InitializeComponent();
-        }
+	public partial class TestForm : Form
+	{
+		public TestForm()
+		{
+			InitializeComponent();
+		}
 
-        private void Button1_Click(object sender, EventArgs e)
-        {
-            ShiftDemo demo = new ShiftDemo();
+		void Button1_Click(object sender, EventArgs e)
+		{
+			var demo = new ShiftDemo();
 			ShiftWM.Init(demo, textBox1.Text, null);
-	        ShiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.ButtonType.Ok);
-        }
+			ShiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.ButtonType.Ok);
+		}
 
-        private void button2_Click(object sender, EventArgs e) 
-			=> ShiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter.ToIcon());
-    }
-}
+		void button2_Click(object sender, EventArgs e)
+			=> ShiftWM.Init(new Shifter(), "Shifter", Resources.iconShifter);
+	}
+}
\ No newline at end of file