Language and spelling
Merge remote-tracking branch 'origin/master'

Conflicts:
	connectfour/report/report.tex