test conf2
Merge branch 'master' of https://github.com/SOUROURMEDDEBDIT/3A12

Conflicts:
	doctestname.txt