Cambios
Malo conflicto

Conflicts:
	Bodega/nbproject/private/private.xml