Lunes
Merge branch 'master' of https://github.com/Lauradelrio/webApp
Lunes2
Merge branch 'master' of https://github.com/Lauradelrio/webApp

Conflicts:
	src/main/java/resources/client/HandlerChat.java
Merge branch 'master' of https://github.com/Lauradelrio/webApp
Merge branch 'master' of https://github.com/Lauradelrio/webApp

Conflicts:
	src/main/java/resources/client/HandlerChat.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/resources/client/Login.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Lauradelrio/webApp

Conflicts:
	src/main/java/resources/client/HandlerChat.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/resources/client/View/LoginChat.java
	src/main/webapp/login.css
	src/main/webapp/login.html