Add merge sort
Merge commit '223f09b'