Agregada informacion a habitaciones
Merge branch 'habitaciones'
Merge remote-tracking branch 'origin' into luis
habitaciones