Merge branch 'evaluation' into Parker
Committing changes
Merge branch 'Parker' into evaluation
Merge branch 'Ryan-Haglund' into evaluation
removing stuff
Merge branch 'evaluation' into Ryan-Haglund