Added a unit test.
Changed capitalization of quicksort.cpp to QuickSort.cpp
Fixed a merge conflict.