gitnore
merge
gitnore
Merge remote-tracking branch 'origin/master' into esteban-lopez
Merge remote-tracking branch 'origin/master' into esteban-lopez
Merge remote-tracking branch 'origin/master' into esteban-lopez
Beca
lopez
Conflicts:
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/Uc_Becas.vb