Commit para bajar cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	FrbaHotel/FrbaHotel.suo