sync
Merge branch 'master' of github.com:HerrMuellerluedenscheid/msc

Conflicts:
	docs/introduction.tex