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
test
Merge branch 'dom' of https://github.com/Memedsmile/editeur-web into dom
Merge branch 'dom' of https://github.com/Memedsmile/editeur-web into dom
lol, j'avais pas fait de commit
include
suppression de bugs
test
modification de makefile
test
modifs
test
Merge branch 'dom' of https://github.com/hugodes/editeur-web into dom

Conflicts:
	dom.cc
Merge pull request #77 from hugodes/dom

Dom