Merge pull request #1 from kenfox/master

example pull request. changed a line.
Merge pull request #2 from kenfox/master

more stuff and a new file