Added functionality for soft constriant two and seven
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project
fixed problems with calcSoftFour method in constraints.java