test
Merge branch 'master' into dom

Conflicts:
	facteur.h
	test.cc
test
test
Merge branch 'dom' of https://github.com/Memedsmile/editeur-web into dom