Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/FletcherEvaluation.java
	src/test/LangermanEvaluation.java
	src/test/SphereEvaluation.java