small text change
Merge remote-tracking branch 'upstream/master' into seann
Merge pull request #68 from seannives/seann

Seann