regression done
Merge branch 'softMatching' of https://github.com/wfeely/hw5-team05.git into softMatching