update config
fix bug in soft matching
Merge branch 'softMatching' of github.com:wfeely/hw5-team05 into softMatching