\dash macro
Fix \dash
Merge branch 'master' into index

Conflicts:
	chapters/definitions.tex