Removing error
Merge branch 'evaluation' into Jared-Johnson