Small typo
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/computEL-final/paper.pdf

(I think maybe I didn't push the final final version of the pdf
before...)