Merge branch 'feature-fixes' of https://github.com/NPSVisionLab/CVAC into feature-fixes

Conflicts:
	src/easy/evaluate.py