com
Merge branch 'master' of https://github.com/douarime/protoDoc

Conflicts:
	docs/source/barre message.rst
	docs/source/conf.py
	docs/source/option formulaire.rst
Merge branch 'master' of https://github.com/douarime/protoDoc