update
gfhdfh
Merge https://github.com/stsch47/stitching

Conflicts:
	CMakeLists.txt
	main.cpp