aster
Merge branch 'devel'
truc
tryc
.\.git
Merge branch 'devel'

Conflicts:
	README.md
trs