Merge pull request #5 from ingjaso/master

alters y controladora
Merge pull request #25 from davidpoveda89/master

agregar Recinto y combos anidados