a
Merge remote-tracking branch 'origin/exam' into exam

Conflicts:
	exam/question18.tex