evaluation revised
Merge remote-tracking branch 'origin/master'

Conflicts:
	proposal/related.tex