Parte  1
Merge remote-tracking branch 'origin/paula' into paula

Conflicts:
	BECA2/BECA2.sln
	BECA2/BLL/BLL.csproj
	BECA2/BLL/Properties/AssemblyInfo.cs
	BECA2/DAL/DAL.csproj
	BECA2/DAL/Properties/AssemblyInfo.cs
	BECA2/DAL/Repositories/IRepository.cs
	BECA2/DAL/UnitOfWork.cs
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/IEntity.cs
	BECA2/EntitiesLayer/Properties/AssemblyInfo.cs
	BECA2/TIL/CustomExceptions.cs
	BECA2/TIL/Properties/AssemblyInfo.cs
	BECA2/TIL/TIL.csproj
	BECA2/UI/UI.vbproj
Arreglando
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
gitnore
merge
gitnore
Merge remote-tracking branch 'origin/master' into esteban-lopez
paula
reparando
paula
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/My Project/Application.myapp
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/UI.vbproj
intento arreglar
manifest
Arreglado el master
Merge remote-tracking branch 'origin/master' into esteban-lopez
Registrar accion

Se incluye la funcionalidad de registrar accion, aun sin utilizar
Merge remote-tracking branch 'origin/paula'

Conflicts:
	BECA2/UI/My Project/Resources.Designer.vb
	BECA2/UI/UI.vbproj
Merge