no message
Merge branch 'SIMON' of https://github.com/JonathanWiemers/Simpel-Java-Chat-Client-Server into SIMON

Conflicts:
	TutoriumChat - Common/bin/.DS_Store
	TutoriumChat-Server/bin/.DS_Store