guardar nick listo

asd
Merge branch 'master' of https://github.com/gonras0o/tarea1

Conflicts:
	ClienteChat/build/classes/clientechat/ServerHTTP.class
	ClienteChat/src/clientechat/ServerHTTP.java