cambios menores
Merge branch 'master' of https://github.com/datospy/portal

Conflicts:
	README.md