Update allSort.cpp
Merge branch 'master' of github.com:guanshan/allsort

Conflicts:
	allSort.cpp