Added the soft constraint tests to the Solution
Merge branch 'master' of https://github.com/akmadsen/sisyphus1.git