LEL

LEL
Merge branch 'jorge.argds' of https://github.com/KOIP2/AplicacionBeca2-KOI into jorge.argds
lol

lol
Jorge
Conflicts:
	BECA2/UI/App.config
	BECA2/UI/Frm_Principal.Designer.vb