linea numero 3
test
asdf
sdf
Merge branch 'DesarrolloHiControl' of https://github.com/omarluichi/HospitalInfantil into HospitalInfantil

Conflicts:
	ControlDePacientes/DockGeneral.xaml.cs