Antes no lo corregi ahora sii wi
Merge branch 'master' of https://github.com/CoiroTomas/LO_QUE_SEA

Conflicts:
	src/FrbaHotel.suo