fixed spelling errors/word choice in gsoc
fix merge conflict
recommit
fix merge conflict
Merge pull request #1889 from Kovak/master

gsoc spelling/word choice fixes