fix grammar, punctuation, etc
fix grammar, punctuation, etc
fix merge conflict and nitpicky text edits
merge with upstream
Merge pull request #22 from japacible/text-edits

:paw_prints::dog::paw_prints: Proofread & edit site text :paw_prints::dog::paw_prints: