Merge branch 'master' of https://github.com/kkmann/cme

Conflicts:
	doc/presentation/bias-concordance.tex
Merge branch 'master' of https://github.com/kkmann/cme