review the evaluation chapter
Fix merge conflicts
Add reference that was lost
Merge branch 'evaluation-anders'