Merge pull request #1 from ingjaso/master

merge ale
clase sala
Merge pull request #4 from penajose10/master

agregando clase sala