fix compilation
Merge branch 'master' of github.com:maarten990/KBM

Conflicts:
	presentation/presentation.tex