h
Merge branch 'master' of
https://github.com/supermario94123/javachatserver.git

Conflicts:
	Javachatserver/src/ChatGUI.java