Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop

# Conflicts:
#	RH-Engine/Program.cs

RH-Engine/CreateGraphics.cs

@@ -16,8 +16,8 @@ namespace RH_Engine
 
 
 
-        string tunnelID;                            
-                                                    
+        string tunnelID;
+
         public CreateGraphics(string tunnelID)
         {
             this.tunnelID = tunnelID;
@@ -96,12 +96,12 @@ namespace RH_Engine
                 data = new
                 {
                     id = uuid,
-                   
+
                 }
 
             };
             return JsonConvert.SerializeObject(Payload(payload));
-           
+
         }
 
         public string ModelCommand()
@@ -117,10 +117,10 @@ namespace RH_Engine
                     {
                         model = new
                         {
-                            file = "\\data\\NetworkEngine\\models\\bike\\bikee.fbx",
+                            file = "data\\NetworkEngine\\models\\bike\\bike.fbx",
                             cullbackfaces = true,
                             animated = false,
-                            animation = "\\data\\NetworkEngine\\models\\bike\\bike_anim.fbx"
+                            animation = "data\\NetworkEngine\\models\\bike\\bike_anim.fbx"
                         },
                     }
                 }
@@ -129,6 +129,7 @@ namespace RH_Engine
             return JsonConvert.SerializeObject(Payload(payload));
         }
 
+
         public string RouteCommand()
         {
             return "";
@@ -175,10 +176,11 @@ namespace RH_Engine
             dynamic payload = new
             {
                 id = "scene/skybox/settime",
-                data = new {
+                data = new
+                {
                     time = timeToSet
                 }
-                
+
             };
             return JsonConvert.SerializeObject(Payload(payload));
 
@@ -197,7 +199,7 @@ namespace RH_Engine
             };
         }
 
-       
-        
+
+
     }
 }