Fixing some more Makefile issues.
Adding changes to parent class. Start of Bitonic sort working.
Fixing Bitonic Sort seg fault.
removed quicksort from execution to have working code
Merge branch 'master' into PQuickSort

Conflicts:
	src/SortCommon.cpp
	src/SortCommon.hpp