added merge sort
Merge branch 'merge_sort'