ignorando app.config
Ignorando app.config
Carreras

User control y modificacion de carreras
Merge remote-tracking branch 'origin/jorge.argds'

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