Integrando proyecto
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Merge branch 'marco-rodriguez' of https://github.com/KOIP2/AplicacionBeca2-KOI into marco-rodriguez
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Formulario Crear Carrera
Avance Crear Carrera

Interfaz de Usuario y Logica
REPARANDO CONFLICTOS
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/IEntity.cs
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj