Add merge sort
Merge pull request #3 from asinner/merge_sort

Add merge sort
Fix conflicts