CmakeLists.txt
Merge branch 'master' of https://github.com/rifataras/MedicalImagingProject

Conflicts:
	CMakeLists.txt