Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/src/server/startServer.java

1 files changed, 19 insertions, 0 deletions

diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java
new file mode 100644
index 00000000..6dc587f1
--- /dev/null
+++ b/Dozentenmodul/src/models/Client.java
@@ -0,0 +1,19 @@
+package models;
+
+public class Client {
+
+	private server.Server.Client client;
+	
+	public static Client clientcon=new Client();
+
+	public server.Server.Client getClient() {
+		return client;
+	}
+
+	public void setClient(server.Server.Client client) {
+		this.client = client;
+	}
+	
+	
+	
+}