MergeSort

Added working, tested, complete MergeSort implementation, updated Makefile to
include mergesort compilation
Merge branch 'zamansky-cs2' of github.com:archaephyrryx/hw into zamansky-cs2

Conflicts:
	MergeSort.java