serv.listenForConnection();
	}

<<<<<<< HEAD
	public CameraServer(int port, boolean http, boolean fake) {
		listenPort = port;
		
		if (fake) {
			//myCamera = new se.lth.cs.fakecamera.Axis211A();
		} else {
			myCamera = new se.lth.cs.cameraproxy.Axis211A(host, cameraPort);
			md = new se.lth.cs.cameraproxy.MotionDetector(host, cameraPort);
			}
		
=======
	public CameraServer(int port, boolean http) {
		this.port = port;
		myCamera = new se.lth.cs.cameraproxy.Axis211A(host, 4321);
		md = new se.lth.cs.cameraproxy.MotionDetector(host, 4321);

>>>>>>> 2cfb686b3a674cd888786ce3fe1b3145ebaaf9c7
		if (http) {
			httpServer = new JPEGHTTPServerThread(8080, myCamera);
			httpServer.start();

		serv.listenForConnection();
	}

	public CameraServer(int port, boolean http) {
		this.port = port;
		myCamera = new se.lth.cs.cameraproxy.Axis211A(host, 4321);
		md = new se.lth.cs.cameraproxy.MotionDetector(host, 4321);

		if (http) {
			httpServer = new JPEGHTTPServerThread(8080, myCamera);
			httpServer.start();