zeugs
Merge branch 'postexam' of github.com:fuchsmich/velopt into postexam

Conflicts:
	main-gui.tng