Merge branch 'master' of https://github.com/ICastro17/ProjectChatJava
Merge branch 'master' of github.com:ICastro17/ProjectChatJava

Conflicts:
	src/servidor/Servidor.java
	src/servidor/gui/ServidorPrincipal.java