More tests for Soft Constraint 2
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project

Conflicts:
	src/test/ConstraintTests.java
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project
Fix for Soft Constraint 6 test
Fix for soft constraint 6 test
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project

Conflicts:
	src/test/ConstraintTests.java
Further unit tests completed