a
Merge branch 'master' of https://github.com/ALX5/PJS

Conflicts:
	src/CMakeLists.txt
	src/Distortion/HomographyCalculator.cpp
	src/Distortion/TestSources.cpp
	src/Distortion/plane.cpp
	src/Main.cpp