Glenda test 1
Merge pull request #1 from glendagonzales/branches/test1

Glenda test 1
Resolved conflict - glenda
Merge pull request #3 from glendagonzales/master

Let's see if you get conflicts