temp
Merge branch 'master' of https://github.com/martinchodev/medicopedia

Conflicts:
	src/es/medicopedia/CheckConnectivity.java