prueba
Merge branch 'master' of https://github.com/berice001/Enfermedades

Conflicts:
	.idea/workspace.xml