ajout clear
Merge branch 'master' of github.com:Amxx/3DScanner

Conflicts:
	CMakeLists.txt
	src/engine.cpp