Merge pull request #3 from Tzesar/master

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

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

Inicio de sesion del jugador implementada.
Merge pull request #4 from Tzesar/master

Pestañas adheridas
Merge pull request #5 from roy2406/master

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

Pestañas
Merge pull request #6 from roy2406/master

Merge pull request #2 from Pweb-fpuna/master
Merge pull request #7 from divina0210/master

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

asd
Merge pull request #8 from Tzesar/master

Porque SI
Merge pull request #9 from divina0210/master

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

asd
Merge pull request #10 from Tzesar/master

Ya gana, ya pierde y ya empata
Merge pull request #1 from Pweb-fpuna/master

Ya gana, ya pierde y ya empata
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
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