add function to swap socks
Merge pull request #6 from rivese/js_additions

add function to swap socks
fix obvious git typo in JS
Merge pull request #8 from CharlesGust/typo

fix obvious git typo in JS
access global sockHolder to color socks
Merge pull request #9 from CharlesGust/coloredsocks

access global sockHolder to color socks
add setTimeout functionto swapSocks
Merge pull request #10 from rivese/js_additions

add setTimeout functionto swapSocks
implement the sockSort using jQuery objs
resolve merge conflict
Merge pull request #11 from CharlesGust/sortfunction

Sortfunction
attempt to do fadeIn/fadeOut, but functions not chained, ids might be duplicated
Merge branch 'master' of https://github.com/CharlesGust/SockSort into displayattempt
Merge pull request #13 from CharlesGust/displayattempt

Displayattempt
fixed merge conflicts