Cimmot pequeño
Merge remote-tracking branch 'origin/master' into marco-rodriguez

Conflicts:
	BECA2/UI/Frm_ReporteProforma.vb
Integrando proyecto
arreglando
Merge branch 'esteban-lopez' of https://github.com/KOIP2/AplicacionBeca2-KOI into esteban-lopez

Conflicts:
	.gitignore
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_Beca.Designer.vb
	BECA2/UI/Frm_ReporteProforma.vb
	BECA2/UI/Frm_SeleccionarBeneficios.Designer.vb
	BECA2/UI/Frm_SeleccionarCarreras.Designer.vb
	BECA2/UI/Frm_SeleccionarRequisitos.Designer.vb
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/UC_SeleccionarBeneficios.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.Designer.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_SeleccionarCarreras.Designer.vb
listo
Merge remote-tracking branch 'origin/esteban-lopez'

Conflicts:
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_Beca.Designer.vb
	BECA2/UI/Frm_ReporteProforma.vb
	BECA2/UI/Frm_SeleccionarBeneficios.Designer.vb
	BECA2/UI/Frm_SeleccionarCarreras.Designer.vb
	BECA2/UI/Frm_SeleccionarRequisitos.Designer.vb
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/UC_SeleccionarBeneficios.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.Designer.vb
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_SeleccionarCarreras.Designer.vb
master apesta

master apesta
Instalador
listo
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/Frm_CrearUsuario.vb
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/Frm_ReporteProforma.vb
Merge remote-tracking branch 'origin/esteban-lopez'

Conflicts:
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_Beca.Designer.vb
	BECA2/UI/Frm_ReporteProforma.vb
	BECA2/UI/Frm_SeleccionarBeneficios.Designer.vb
	BECA2/UI/Frm_SeleccionarCarreras.Designer.vb
	BECA2/UI/Frm_SeleccionarRequisitos.Designer.vb
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/UC_SeleccionarBeneficios.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.Designer.vb
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_SeleccionarCarreras.Designer.vb
merge