Fixing some more Makefile issues.
Adding changes to parent class. Start of Bitonic sort working.
Merge branch 'master' into mergesort

Conflicts:
	src/MergeSort.cpp
	src/MergeSort.hpp