Merge pull request #1 from ingjaso/master

Merge alejandro
recinto
Merge pull request #5 from davidpoveda89/master

agregando recinto
Merge pull request #6 from penajose10/master

Clase zona
Merge pull request #3 from ingjaso/master

recinto sala y zona