Update Makefile
CMakeLists.txt introduction
Merge branch 'master' of https://github.com/rh-lab-q/server-side-dependency-solving

Conflicts:
	tests/OldMakefile