Merge pull request #2 from ldurazo/master

first commit ever
Merge pull request #1 from jmsalcido/master

Merge pull request #2 from ldurazo/master