Updated code.
Merge branch 'master' of git@github.com:NicholasMerrill/Optimizer.git

Conflicts:
	bin/solutions/SolutionSet.class
	src/solutions/SolutionSet.java