Merge pull request #1 from jadiosa/master

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

Merge pull request #1 from jadiosa/master