Merge pull request #3 from Pweb-fpuna/master

asd
Merge pull request #11 from divina0210/master

Merge pull request #3 from Pweb-fpuna/master
Merge pull request #4 from Pweb-fpuna/master

asd
bootbox add
varios
Ya cierra las pestanhas
Merge pull request #12 from divina0210/master

cambios
Merge branch 'master' of https://github.com/Tzesar/tarea1 into Tzesar-master

Conflicts:
	tarea1/web/js/client.js
Merge branch 'Tzesar-master'
Merge pull request #14 from roy2406/master

Merge pull request #1 from Pweb-fpuna/master
Merge pull request #2 from Pweb-fpuna/master

-Ya esta