Arreglado errores de Habitacion
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrbaHotel.suo
Merge branch 'master' of https://github.com/CoiroTomas/LO_QUE_SEA