._.
Merge branch 'master' of https://github.com/OzwaldoC8/SPA

Conflicts:
	Codigo/MD_SPA/bin/Debug/MD_SPA.dll
	Codigo/MD_SPA/bin/Debug/MD_SPA.pdb
	Codigo/MD_SPA/obj/Debug/MD_SPA.dll
	Codigo/MD_SPA/obj/Debug/MD_SPA.pdb
	Codigo/RN_SPA/bin/Debug/MD_SPA.dll
	Codigo/RN_SPA/bin/Debug/MD_SPA.pdb
	Codigo/RN_SPA/bin/Debug/RN_SPA.dll
	Codigo/RN_SPA/bin/Debug/RN_SPA.pdb
	Codigo/RN_SPA/obj/Debug/RN_SPA.csprojResolveAssemblyReference.cache
	Codigo/RN_SPA/obj/Debug/RN_SPA.dll
	Codigo/RN_SPA/obj/Debug/RN_SPA.pdb
	Codigo/SPA.v11.suo
	Codigo/SPA/bin/Debug/MD_SPA.dll
	Codigo/SPA/bin/Debug/MD_SPA.pdb
	Codigo/SPA/bin/Debug/RN_SPA.dll
	Codigo/SPA/bin/Debug/RN_SPA.pdb
	Codigo/SPA/bin/Debug/SPA.exe
	Codigo/SPA/bin/Debug/SPA.pdb
	Codigo/SPA/obj/Debug/SPA.Properties.Resources.resources
	Codigo/SPA/obj/Debug/SPA.csproj.GenerateResource.Cache
	Codigo/SPA/obj/Debug/SPA.csprojResolveAssemblyReference.cache
	Codigo/SPA/obj/Debug/SPA.exe
	Codigo/SPA/obj/Debug/SPA.pdb