sube los cambios a el repositorio
Merge branch 'feature-02' into dev

Conflicts:
	README.md