Configuración de Guatemala
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/Login.cs
	ortoxela/Resources/Logo final.jpg
	ortoxela/app.config
	ortoxela/ortoxela.csproj
Final Changes
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/Login.Designer.cs
	ortoxela/Login.cs
	ortoxela/Resources/Logo final.jpg
	ortoxela/ortoxela.csproj
Fixes
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/ortoxela.csproj
borrando formulario
Merge branch 'master' of github.com:masterinho52/OrtXla into JFAM

Conflicts:
	ortoxela/Clientes/frm_medico2.Designer.cs
	ortoxela/Clientes/frm_medico2.cs
	ortoxela/Clientes/frm_medico2.resx
	ortoxela/ortoxela.csproj
Add frm medicos
Arregle vale porque estaba imprimiendo 2 hojas.