Edited merge sort to follow the conventions of the project a little more closely