loggin
Merge branch 'master' of https://github.com/julentv/ChatMulticast.git

Conflicts:
	ChatMulticast/src/es/deusto/ingenieria/ssd/chat/multicast/client/MulticastClient.java
	ChatMulticast/src/es/deusto/ingenieria/ssd/chat/multicast/controller/Controller.java