Merge remote-tracking branch 'origin/develop' into develop

RH-Engine/Program.cs

@@ -11,7 +11,7 @@ namespace RH_Engine
 {
     public delegate void HandleSerial(string message);
 
-    class Program
+    public class Program
     {
         private static PC[] PCs = {
             //new PC("DESKTOP-M2CIH87", "Fabian"),
@@ -226,6 +226,7 @@ namespace RH_Engine
 
 
 
+<<<<<<< HEAD
             //Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand));
 
             //command = mainCommand.AddModel("car", "data\\customModels\\TeslaRoadster.fbx");
@@ -244,6 +245,9 @@ namespace RH_Engine
             //  Console.WriteLine("Color panel: " + ReadPrefMessage(stream));
             //  WriteTextMessage(stream, mainCommand.SwapPanel(uuidPanel));
             //  Console.WriteLine("Swap panel: " + ReadPrefMessage(stream));
+=======
+            Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand));
+>>>>>>> develop
         }
 
         /// <summary>