finished?
Merge remote-tracking branch 'refs/remotes/Manu/master'

Conflicts:
	presentation/include/07_scal_avail_fault_tol.tex
Merge pull request #6 from MarcSpicker/master

Close call