Update mergesortCON slideshow, fix build in C++ makefile