Update quotefile
Merged branches from Ezrael and Igrisok.
Corrected some typos.
Merge branch 'master' of https://github.com/joek295/cambridge-tw

Conflicts:
	quotefile

merged ezrael and igriskor's edits