From 9c60521d00aef3a2b304763a55b21f01dc2c9bd8 Mon Sep 17 00:00:00 2001
From: cir27 <cir27@uclive.ac.nz>
Date: Tue, 2 May 2017 16:41:40 +1200
Subject: [PATCH] Merge branch 'develop' of C:\Users\CJIRWIN\Documents\team-13
 with conflicts.

---
 src/main/java/seng302/App.java | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 0637d2cc..39ca3e8a 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -5,6 +5,9 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import seng302.models.parsers.StreamParser;
+import seng302.models.parsers.StreamReceiver;
+import seng302.server.ServerThread;
 
 public class App extends Application
 {
@@ -18,6 +21,28 @@ public class App extends Application
     }
 
     public static void main(String[] args) {
+        StreamReceiver sr;
+
+        new ServerThread("Racevision Test Server");
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+//        if (args.length > 1){
+//            sr = new StreamReceiver("localhost", 8085, "RaceStream");
+//        }
+//        else{
+              sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("localhost", 8085, "RaceStream");
+//        }
+
+        sr.start();
+        StreamParser streamParser = new StreamParser("StreamParser");
+        streamParser.start();
+
         launch(args);
     }
 }