My second changes
Merge pull request #2 from smasterson/my-second-branch

My second changes