Funcionalidad de chat completa
Funcionalidad de chat completa
Funcionalidad de chat completa (merge)
Merge origin/master

Conflicts:
	SchoolServer/nbproject/private/private.properties
Merge exitoso
Merge origin/main into main

Conflicts:
	SchoolServer/nbproject/private/private.properties