ignorando app.config
Ignorando app.config
Carreras

User control y modificacion de carreras
lel

xD
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/UI.vbproj
Merge remote-tracking branch 'origin/esteban-lopez'
Merge branch 'paula' of https://github.com/KOIP2/AplicacionBeca2-KOI into paula

Conflicts:
	BECA2/BLL/GestorCarrera.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/DAL.csproj
	BECA2/DAL/Repositories/CarreraRepository.cs
	BECA2/DAL/app.config
	BECA2/UI/App.config
	BECA2/UI/Frm_Carreras.Designer.vb
	BECA2/UI/Frm_Carreras.resx
	BECA2/UI/Frm_CrearCarrera.designer.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearUsuario.Designer.vb
	BECA2/UI/Frm_InicioDeSesion.Designer.vb
	BECA2/UI/Frm_InicioDeSesion.vb
	BECA2/UI/ModuloGlobal.vb
	BECA2/UI/Pop up/pop_up_agregarUsuario.Designer.vb
	BECA2/UI/Pop up/pop_up_agregarUsuario.vb
	BECA2/UI/Pop up/pop_up_inicioSesion.Designer.vb
	BECA2/UI/UI.vbproj