Merge branch 'master' into dev-sort
add count sort, but have bugs
fix bugs in count-sort
Merge branch 'dev-sort'