Locally modified CMakeLists.txt
Merge branch 'master' of ssh://github.com/travisdesell/tomography

Conflicts:
	CMakeLists.txt
Merge branch 'master' of ssh://github.com/travisdesell/tomography