Fixing conflicts
Merge branch 'master' of https://github.com/selig/qea.git

Conflicts:
	code/qea/src/benchmark/rovers/RVunitDoEval.java