primer commit
Merge pull request #1 from danielRomero/staging

primer commit