AddGui Design
Merge branch 'master' of https://github.com/Distribuerede-systemer/server

Conflicts:
	src/MultiThreadChatClient.java
Merge branch 'master' of https://github.com/Distribuerede-systemer/server