Merge pull request #4 from afloresjpg/aflores

cambio desde aflores
cambio desde fchalabe
Merge remote-tracking branch 'origin/develop' into aflores

Conflicts:
	README.md