la concha de nha lora ya saleeee
Merge branch 'master' of https://github.com/raquel0906/PRUEBA

Conflicts:
	Samuelito/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Samuelito/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Samuelito/obj/Debug/Samuelito.csproj.FileListAbsolute.txt
	samuelito2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/raquel0906/PRUEBA
modificado por vivichu
modificado por vivichu