Arreglando

Arreglando

Arreglando

Merge
Conflicts:
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/UI/My
Project/Application.Designer.vb
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/UI.vbproj

laksdda

merge

Merge

wen

jorge

marco

beca, perfil, contraseña

gitignore