Removing error
Merge branch 'evaluation' into Aaron-Flores