Merge pull request #3 from erdvillegas/master

Templates Listos
Merge pull request #4 from erdvillegas/develop

Merge pull request #3 from erdvillegas/master