Debug deleted
Merge branch 'master' of https://github.com/andreybs11/Proyecto_Infra_I

Conflicts:

	Progra2_Infra1/Progra2_Infra_1/Progra2_Infra_1/bin/Debug/Progra2_Infra_1.exe

	Progra2_Infra1/Progra2_Infra_1/Progra2_Infra_1/bin/Debug/Progra2_Infra_1.pdb

	Progra2_Infra1/Progra2_Infra_1/Progra2_Infra_1/obj/Debug/Progra2_Infra_1.csproj.GenerateResource.Cache

	Progra2_Infra1/Progra2_Infra_1/Progra2_Infra_1/obj/Debug/Progra2_Infra_1.exe

	Progra2_Infra1/Progra2_Infra_1/Progra2_Infra_1/obj/Debug/Progra2_Infra_1.pdb