merged
Merge branch 'master' of https://github.com/martinberger/control

Conflicts:
	encoding.tex