login de usuario entre otras cosas que ya no recuerdo
Merge remote-tracking branch 'origin/master'

Conflicts:
	ControldeAlumnosPVI/ControldeAlumnosPVI.v11.suo
	ControldeAlumnosPVI/ControldeAlumnosPVI/NuevaTTE.Designer.cs

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/bin/Debug/ControldeAlumnosPVI.pdb

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.csproj.FileListAbsolute.txt

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

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.exe

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/ControldeAlumnosPVI.pdb

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/DesignTimeResolveAssemblyReferences.cache

	ControldeAlumnosPVI/ControldeAlumnosPVI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache