Added calcSoftSix to Constraints.java
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project