se435 #2 v3
mondays changes
Merge branch 'master' of https://github.com/Timv123/se435

Conflicts:
	bin/AdminLooper.class
	bin/AdminWorker.class
	bin/JokerAdminClient.class
	bin/JokerServer.class
	bin/Worker.class
	src/JokerAdminClient.java
	src/JokerServer.java
Merge branch 'master' of https://github.com/Timv123/se435