Typos and errors
Merge branch 'master' of github.com:andrejbauer/tt

Conflicts:
	doc/brazil.tex