Stage one of multifield matching
Merge pull request #707 from Gravecorp/master

Stage one of multifield matching
Reverted to ba3023ca511e48e68265d18c30bf936db787fa88
Merge branch 'master' of github.com:kellyelton/OCTGN
Merge branch 'master' of github.com:kellyelton/OCTGN into ReworkGameplay