more
Merge branch 'master' of https://github.com/tertium/TFF1

Conflicts:
	short/tff1short.tex
more
more