Correcting spelling and grammar errors

Also removing whitespace at end of lines, despite this file being CRLF.
Merge branch 'master' of https://github.com/snackbandit/scala-tour into snackbandit-master

Conflicts:
	project/translate-zh.scala
Update