Text Fix
Merge remote-tracking branch 'upstream/master'
Spelling Fix
Merge pull request #185 from ZachieBlade/master

Zach's Pull Request
Fixes conflict