added merge sort

not updated for doug's comments yet