Piou
Merge branch 'master' of github.com:TriComp/TriComp

Conflicts:
	compil/tests/poncho.tricot