reporte
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controladora/bin/Debug/Controladora.exe
	Controladora/bin/Debug/Controladora.pdb
	Controladora/bin/Debug/DAO.exe
	Controladora/bin/Debug/DAO.pdb

	Controladora/obj/x86/Debug/Controladora.csprojResolveAssemblyReference.cache
	Controladora/obj/x86/Debug/Controladora.exe
	Controladora/obj/x86/Debug/Controladora.pdb
	DAO/DAOEntradas.cs
	DAO/bin/Debug/DAO.exe
	DAO/bin/Debug/DAO.pdb
	DAO/obj/x86/Debug/DAO.exe
	DAO/obj/x86/Debug/DAO.pdb
	WindowsFormsApplication1/bin/Debug/Controladora.exe
	WindowsFormsApplication1/bin/Debug/Controladora.pdb
	WindowsFormsApplication1/bin/Debug/DAO.exe
	WindowsFormsApplication1/bin/Debug/DAO.pdb
	WindowsFormsApplication1/bin/Debug/WindowsFormsApplication1.exe
	WindowsFormsApplication1/bin/Debug/WindowsFormsApplication1.pdb

	WindowsFormsApplication1/obj/x86/Debug/WindowsFormsApplication1.csproj.GenerateResource.Cache

	WindowsFormsApplication1/obj/x86/Debug/WindowsFormsApplication1.csprojResolveAssemblyReference.cache
	WindowsFormsApplication1/obj/x86/Debug/WindowsFormsApplication1.exe
	WindowsFormsApplication1/obj/x86/Debug/WindowsFormsApplication1.pdb