Theirs commit
Merge pull request #1 from clarkbremer/theirs

Theirs commit