fix obvious git typo inserted into JS
Merge branch 'master' of https://github.com/CharlesGust/SockSort into matchLists
fixed merge conflicts
Merge branch 'matchLists'