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 remote-tracking branch 'origin/Wen'

Conflicts:
	.gitignore
	BECA2/DAL/app.config
	BECA2/UI/App.config