primer commit
Merge https://github.com/gabrielescobar/tallersesion2