TinCan Version angelegt.
Merge branch 'tincan'

Conflicts:
	tincan.tex