Merge pull request #2 from jadiosa/master

Merge Diosa-Jennifer
Merge pull request #10 from jenniferperez/master

Merge pull request #2 from jadiosa/master