Commit
Merge branch 'master' of https://github.com/gstding/LOG635

Conflicts:
	labo2/lexique.fcfg