test
Merge branch 'master' into dom

Conflicts:
	facteur.h
	test.cc