Merge branch 'NetworkedVisualiser' into splitIntoTwoModules

# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
This commit is contained in:
Joseph Gardner
2017-05-01 16:51:03 +12:00
45 changed files with 107 additions and 2130 deletions
@@ -5,7 +5,6 @@ import javafx.scene.paint.Color;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import seng302.GPSCoordinate;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.xml.sax.SAXException;