ModificarCurso

lol
Merge remote-tracking branch 'origin/Wen' into Wen

Conflicts:
	BECA2/DAL/app.config
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Reparando
Merge remote-tracking branch 'origin/master' into Wen

Conflicts:
	BECA2/DAL/app.config
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Merge branch 'Wen' of https://github.com/KOIP2/AplicacionBeca2-KOI into Wen

Conflicts:
	BECA2/DAL/app.config
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Reparando

Merge remote-tracking branch 'origin/Wen' into
Wen

Conflicts:
	BECA2/DAL/app.config
	BECA2/UI/My
Project/Application.Designer.vb
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/UI.vbproj
Reparando
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'
gitignore
giignore
Merge remote-tracking branch 'origin/Wen'

Conflicts:
	.gitignore
	BECA2/DAL/app.config
	BECA2/UI/App.config
Error por equivocacion trabaje en rama master
Merge branch 'master' of https://github.com/KOIP2/AplicacionBeca2-KOI