Merge branch 'master' of https://github.com/YvensFaos/DisciplinaCGplines

Conflicts:
	SplinesImplementation/SplinesImplementation/CubicHermite.h