Fixed merge sort, added quicksort
Fixed quicksort
1,add configration
Merge remote-tracking branch 'upstream/master'