commit macizo
Merge remote-tracking branch 'origin/master'

Conflicts:
	ControldeAlumnosPVI/ControldeAlumnosPVI.v11.suo
	ControldeAlumnosPVI/ControldeAlumnosPVI/Form1.cs

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.pdb
	ControldeAlumnosPVI/ControldeAlumnosPVI/database/Conexion.cs

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.Properties.Resources.resources

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

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.pdb