Good merge?
Merge branch 'master' of git@github.com:NicholasMerrill/Optimizer.git

Conflicts:
	src/problems/BoxMinAreaProb.java
	src/problems/NurseSchedProb.java