Add cool feature to file 2.
More cool feature changes.
Merge pull request #1 from clarkr/my-cool-feature-rebase

My cool feature rebase