I forgot to commit. Sorry.

I hope this works?
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/solver/Consultant.java
	src/solver/PathPlanner.java