new consultant thingo
Merge branch 'master' of https://github.com/JonathanHolland/COMP3702

Conflicts:
	Ass2/src/solver/Consultant.java