Ya cierra las pestanhas
Merge branch 'master' of https://github.com/Tzesar/tarea1 into Tzesar-master

Conflicts:
	tarea1/web/js/client.js
Merge branch 'Tzesar-master'