added block variable
tried to fix conflicts in cmakelists
Merge branch 'master' of https://github.com/Humhu/IntelligentDesign

Conflicts:
	CMakeLists.txt