Primera publicación
Revert "Primera publicación"

This reverts commit 6c3013c1b472d06229a98ac24242d24476b094e2.
Revert "Revert "Primera publicación""

This reverts commit 2f1e3e5071a7d3c893156754fc196a0411e9c2c6.
Merge branch 'test'

Conflicts:
	.gitignore