messenger gui in place
Merge branch 'master' of https://github.com/treppenkind/MultiChannel.git

Conflicts:
	src/main/java/ch/zhaw/multichannel/Client.java