detalles tte exportar
Merge remote-tracking branch 'origin/master'

Conflicts:
	ControldeAlumnosPVI/ControldeAlumnosPVI.v11.suo

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.pdb

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.csproj.GenerateResource.Cache

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.pdb
Merge branch 'master' of https://github.com/DarthCharles/ProyectoPVI

Conflicts:
	ControldeAlumnosPVI/ControldeAlumnosPVI.v11.suo

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.pdb

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.pdb