Maj doc
Merge branch 'master' of github.com:jpfleury/gedit-markdown

Conflicts:
	LISEZ-MOI.md
	README.md