Fixed java 1.6 problems.
Added stubs for merge sort