Adding a paragraph
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from shearichard/master

Here's a trivial change